From 68819835624176a50440c2d6f1e101dff7315d91 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 17 Jun 2011 08:47:36 +0000 Subject: [PATCH] Added GLES version checks to prevent build problems under GLES1 and GLES2 --- src/osgUtil/RenderStage.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp index c4c3dd5df..0819b863f 100644 --- a/src/osgUtil/RenderStage.cpp +++ b/src/osgUtil/RenderStage.cpp @@ -997,6 +997,7 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b blitMask, GL_NEAREST); } +#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) if (needToBlitColorBuffers) { for (FrameBufferObject::AttachmentMap::const_iterator @@ -1015,11 +1016,12 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b GL_COLOR_BUFFER_BIT, GL_NEAREST); } } - // reset the read and draw buffers? + // reset the read and draw buffers? will comment out for now with the assumption that + // the buffers will be set explictly when needed elsewhere. // glReadBuffer(GL_COLOR_ATTACHMENT0_EXT); // glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); } - +#endif apply_read_fbo = true; read_fbo = _resolveFbo.get();