From c81317b5b0fc517bf6e5da7cf356be30b440c2d5 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Wed, 28 Feb 2018 14:07:42 +0100 Subject: [PATCH] remove _EXT from GL_MAX_ARRAY_TEXTURE_LAYERS_EXT and GL_TEXTURE_BINDING_2D_ARRAY_EXT --- src/osg/GLExtensions.cpp | 2 +- src/osg/Image.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp index 7b81b5398..ef3ec20d5 100644 --- a/src/osg/GLExtensions.cpp +++ b/src/osg/GLExtensions.cpp @@ -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); diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp index 080cce8a7..a2ccc85fc 100644 --- a/src/osg/Image.cpp +++ b/src/osg/Image.cpp @@ -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;