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

7
src/osg/TextureRectangle.cpp
View File

@@ -312,7 +312,7 @@ void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& st
computeInternalFormat();
glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking());
#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
#endif
@@ -395,8 +395,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
computeInternalFormat();
glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking());
unsigned int rowLength = image->getRowLength();
unsigned int rowLength = image->getRowLength();
#ifdef DO_TIMING
osg::Timer_t start_tick = osg::Timer::instance()->tick();
@@ -414,7 +413,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
#endif
}
#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