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

Merge pull request #381 from openscenegraph/revert-379-osganimbugfix

Browse Source 
Revert "    following guidance from OpenGL Common Mistakes:"
This commit is contained in:
OpenSceneGraph git repository 2017-11-10 17:00:52 +00:00 committed by GitHub
commit 054727cb00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osg/Texture.cpp
View File

@ -2298,8 +2298,9 @@ void Texture::applyTexImage2D_load(State& state, GLenum target, const Image* ima
if (height == 0) if (height == 0)
height = 1; height = 1;
glTexImage2D( target, k, _internalFormat, glTexSubImage2D( target, k,
width, height, _borderWidth, 0, 0,
width, height,
(GLenum)image->getPixelFormat(), (GLenum)image->getPixelFormat(),
(GLenum)image->getDataType(), (GLenum)image->getDataType(),
dataPtr + image->getMipmapOffset(k)); dataPtr + image->getMipmapOffset(k));
@ -2602,11 +2603,12 @@ void Texture::applyTexImage2D_subload(State& state, GLenum target, const Image*
if (height == 0) if (height == 0)
height = 1; height = 1;
glTexImage2D( target, k, _internalFormat, glTexSubImage2D( target, k,
width, height, _borderWidth, 0, 0,
(GLenum)image->getPixelFormat(), width, height,
(GLenum)image->getDataType(), (GLenum)image->getPixelFormat(),
dataPtr + image->getMipmapOffset(k)); (GLenum)image->getDataType(),
dataPtr + image->getMipmapOffset(k));
width >>= 1; width >>= 1;
height >>= 1; height >>= 1;