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

Changed the _ARB cube map defines to non ARB versions.

Browse Source
This commit is contained in:
Robert Osfield
2010-10-09 11:51:24 +00:00
parent a9dd08c3ba
commit ffa75c9c84
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osg/glu/libutil/mipmap.cpp
View File

@@ -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;