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

From Stephan Huber, attached you'll find a compile fix for the new introduced rowlength-feature on IOS/OpenGL ES builds

Browse Source
This commit is contained in:
Robert Osfield
2012-02-10 15:57:51 +00:00
parent 06e88f3b91
commit bd81dd5ff8
7 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/TextureRectangle.cpp
View File

@@ -312,7 +312,9 @@ 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)
glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
#endif
bool useClientStorage = extensions->isClientStorageSupported() && getClientStorageHint();
if (useClientStorage)
@@ -412,7 +414,9 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
#endif
}
#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength);
#endif
if(isCompressedInternalFormat(_internalFormat) && extensions->isCompressedTexSubImage2DSupported())
{