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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/Image.cpp
View File

@ -798,7 +798,7 @@ unsigned int Image::getTotalSizeInBytesIncludingMipmaps() const
void Image::setRowLength(int length)
{
_rowLength = length;
#if defined(OSG_GLES1_FEATURES) || defined(OSG_GLES2_FEATURES)
#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
if (length > 0)
{
OSG_WARN << "Image::setRowLength is not supported on this platform, ignoring" << std::endl;

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)

2
src/osg/Texture2DArray.cpp
View File

@ -455,7 +455,7 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
}
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

2
src/osg/Texture3D.cpp
View File

@ -380,7 +380,7 @@ void Texture3D::applyTexImage3D(GLenum target, Image* image, State& state, GLsiz
image->ensureValidSizeForTexturing(extensions->maxTexture3DSize());
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

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

2
src/osgText/Glyph.cpp
View File

@ -475,7 +475,7 @@ void Glyph::subload() const
glPixelStorei(GL_UNPACK_ALIGNMENT,getPacking());
#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
glPixelStorei(GL_UNPACK_ROW_LENGTH,getRowLength());
#endif