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

Added State::getActiveUnit and usage of it in the glTexCopyImage*() implementations

Browse Source
This commit is contained in:
Robert Osfield
2005-03-25 11:07:48 +00:00
parent 9de5dc38f1
commit 60cecb8959
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/Texture2D.cpp
View File

@@ -293,7 +293,7 @@ void Texture2D::copyTexImage2D(State& state, int x, int y, int width, int height
// inform state that this texture is the current one bound.
state.haveAppliedAttribute(this);
state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
}
void Texture2D::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height )
@@ -336,7 +336,7 @@ void Texture2D::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x,
if (hardwareMipMapOn) glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_FALSE);
// inform state that this texture is the current one bound.
state.haveAppliedAttribute(this);
state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
}
else