FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #488 from LaurensVoerman/submit_array_ext

Browse Source 
remove _EXT from GL_MAX_ARRAY_TEXTURE_LAYERS_EXT
This commit is contained in:
OpenSceneGraph git repository 2018-02-28 14:10:15 +00:00 committed by GitHub
commit eafab0fc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/GLExtensions.cpp
View File

@ -969,7 +969,7 @@ GLExtensions::GLExtensions(unsigned int in_contextID):
max2DSize = 0;
if (validContext) glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max2DSize);
maxLayerCount = 0;
if (validContext) glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, &maxLayerCount);
if (validContext) glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxLayerCount);
// Bindless textures
setGLExtensionFuncPtr(glGetTextureHandle, "glGetTextureHandle", "glGetTextureHandleARB","glGetTextureHandleNV", validContext);

2
src/osg/Image.cpp
View File

@ -1274,7 +1274,7 @@ void Image::readImageFromCurrentTexture(unsigned int contextID, bool copyMipMaps
if (extensions->isTexture2DArraySupported)
{
glGetBooleanv(GL_TEXTURE_BINDING_2D_ARRAY_EXT, &binding2DArray);
glGetBooleanv(GL_TEXTURE_BINDING_2D_ARRAY, &binding2DArray);
}
GLenum textureMode = binding1D ? GL_TEXTURE_1D : binding2D ? GL_TEXTURE_2D : bindingRect ? GL_TEXTURE_RECTANGLE : binding3D ? GL_TEXTURE_3D : binding2DArray ? GL_TEXTURE_2D_ARRAY : 0;