Changeset 12532

Timestamp:

06/15/11 11:36:34 (2 years ago)

Author:

robert

Message:

Fixed blitting of FBO's with multiple render targets.

Files:

• OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp

@@ -955 +955 @@
     {
         GLbitfield blitMask = 0;
-
+        bool needToBlitColorBuffers = false;
+        
         //find which buffer types should be copied
         for (FrameBufferObject::AttachmentMap::const_iterator
@@ -971 +972 @@
             case Camera::PACKED_DEPTH_STENCIL_BUFFER:
                 blitMask |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
+                break;
+            case Camera::COLOR_BUFFER:
+                blitMask |= GL_COLOR_BUFFER_BIT;
+                break;
             default:
-                blitMask |= GL_COLOR_BUFFER_BIT;
+                needToBlitColorBuffers = true;
                 break;
             }
@@ -981 +986 @@
         _resolveFbo->apply(state, FrameBufferObject::DRAW_FRAMEBUFFER);
 
-        // Blit to the resolve framebuffer.
-        // Note that (with nvidia 175.16 windows drivers at least) if the read
-        // framebuffer is multisampled then the dimension arguments are ignored
-        // and the whole framebuffer is always copied.
-        fbo_ext->glBlitFramebuffer(
-            0, 0, static_cast<GLint>(_viewport->width()), static_cast<GLint>(_viewport->height()),
-            0, 0, static_cast<GLint>(_viewport->width()), static_cast<GLint>(_viewport->height()),
-            blitMask, GL_NEAREST);
-
+        if (blitMask)
+        {
+            // Blit to the resolve framebuffer.
+            // Note that (with nvidia 175.16 windows drivers at least) if the read
+            // framebuffer is multisampled then the dimension arguments are ignored
+            // and the whole framebuffer is always copied.
+            fbo_ext->glBlitFramebuffer(
+                0, 0, static_cast<GLint>(_viewport->width()), static_cast<GLint>(_viewport->height()),
+                0, 0, static_cast<GLint>(_viewport->width()), static_cast<GLint>(_viewport->height()),
+                blitMask, GL_NEAREST);
+        }
+
+        if (needToBlitColorBuffers)
+        {
+            for (FrameBufferObject::AttachmentMap::const_iterator
+                it = _resolveFbo->getAttachmentMap().begin(),
+                end =_resolveFbo->getAttachmentMap().end(); it != end; ++it)
+            {
+                osg::Camera::BufferComponent attachment = it->first;
+                if (attachment >=osg::Camera::COLOR_BUFFER0)
+                {
+                    glReadBuffer(GL_COLOR_ATTACHMENT0_EXT + (attachment - osg::Camera::COLOR_BUFFER0));
+                    glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT + (attachment - osg::Camera::COLOR_BUFFER0));
+
+                    fbo_ext->glBlitFramebuffer(
+                        0, 0, static_cast<GLint>(_viewport->width()), static_cast<GLint>(_viewport->height()),
+                        0, 0, static_cast<GLint>(_viewport->width()), static_cast<GLint>(_viewport->height()),
+                        GL_COLOR_BUFFER_BIT, GL_NEAREST);
+                }
+            }
+            // reset the read and draw buffers?
+            // glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
+            // glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
+        }
+
+        
         apply_read_fbo = true;
         read_fbo = _resolveFbo.get();