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

Fixed erroneous use #if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES) which should have been #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)

Browse Source
This commit is contained in:
Robert Osfield
2012-02-21 10:38:12 +00:00
parent ec89769e6b
commit 67ce0d5244
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/Texture.cpp
View File

@@ -1922,7 +1922,7 @@ void Texture::applyTexImage2D_load(State& state, GLenum target, const Image* ima
{
pbo = 0;
}
#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength);
#endif
if( !mipmappingRequired || useHardwareMipMapGeneration)
@@ -2177,7 +2177,7 @@ void Texture::applyTexImage2D_subload(State& state, GLenum target, const Image*
{
pbo = 0;
}
#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength);
#endif
if( !mipmappingRequired || useHardwareMipMapGeneration)