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

Build fixes for GLES1, GLES2 and GL3

Browse Source
This commit is contained in:
Robert Osfield
2010-10-08 17:13:59 +00:00
parent 9984281553
commit 078b21fa1e
6 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgText/Text.cpp
View File

@@ -1597,7 +1597,6 @@ void Text::renderOnlyForegroundText(osg::State& state, const osg::Vec4& colorMul
void Text::renderWithDelayedDepthWrites(osg::State& state, const osg::Vec4& colorMultiplier) const
{
glPushAttrib( _enableDepthWrites ? (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) : GL_DEPTH_BUFFER_BIT);
// Render to color buffer without writing to depth buffer.
glDepthMask(GL_FALSE);
drawTextWithBackdrop(state,colorMultiplier);
@@ -1609,7 +1608,9 @@ void Text::renderWithDelayedDepthWrites(osg::State& state, const osg::Vec4& colo
glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
drawTextWithBackdrop(state,colorMultiplier);
}
glPopAttrib();
state.haveAppliedAttribute(osg::StateAttribute::DEPTH);
state.haveAppliedAttribute(osg::StateAttribute::COLORMASK);
}
void Text::drawTextWithBackdrop(osg::State& state, const osg::Vec4& colorMultiplier) const