From ffa75c9c847090a197132d3f30841065dcbeb076 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 9 Oct 2010 11:51:24 +0000 Subject: [PATCH] Changed the _ARB cube map defines to non ARB versions. --- src/osg/glu/libutil/mipmap.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/osg/glu/libutil/mipmap.cpp b/src/osg/glu/libutil/mipmap.cpp index 87fc962b0..bec349c4c 100644 --- a/src/osg/glu/libutil/mipmap.cpp +++ b/src/osg/glu/libutil/mipmap.cpp @@ -3462,20 +3462,20 @@ static void closestFit(GLenum target, GLint width, GLint height, glTexImage2D(proxyTarget, 1, /* must be non-zero */ internalFormat, widthAtLevelOne,heightAtLevelOne,0,format,type,NULL); - } else -#if defined(GL_ARB_texture_cube_map) - if ((target == GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB) || - (target == GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB) || - (target == GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB) || - (target == GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB) || - (target == GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB) || - (target == GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) { - proxyTarget = GL_PROXY_TEXTURE_CUBE_MAP_ARB; + } + else if ((target == GL_TEXTURE_CUBE_MAP_POSITIVE_X) || + (target == GL_TEXTURE_CUBE_MAP_NEGATIVE_X) || + (target == GL_TEXTURE_CUBE_MAP_POSITIVE_Y) || + (target == GL_TEXTURE_CUBE_MAP_NEGATIVE_Y) || + (target == GL_TEXTURE_CUBE_MAP_POSITIVE_Z) || + (target == GL_TEXTURE_CUBE_MAP_NEGATIVE_Z)) + { + proxyTarget = GL_PROXY_TEXTURE_CUBE_MAP; glTexImage2D(proxyTarget, 1, /* must be non-zero */ internalFormat, widthAtLevelOne,heightAtLevelOne,0,format,type,NULL); - } else -#endif /* GL_ARB_texture_cube_map */ + } + else { assert(target == GL_TEXTURE_1D || target == GL_PROXY_TEXTURE_1D); proxyTarget = GL_PROXY_TEXTURE_1D;