Tweak buffer logic a bit in Batch::draw

[libs/gl.git] / source / framebuffer.cpp

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index 4d6c1752593cdbe54ac60f33d595af5dc1cd6491..ae8f4dd471a936881f77e8e569de8e97ba5bc8c0 100644 (file)
--- a/source/framebuffer.cpp
+++ b/source/framebuffer.cpp
@@ -1,7 +1,7 @@
-#include "arb_draw_buffers.h"
+#include <msp/gl/extensions/arb_draw_buffers.h>
+#include <msp/gl/extensions/ext_framebuffer_blit.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
 #include "error.h"
-#include "ext_framebuffer_blit.h"
-#include "ext_framebuffer_object.h"
 #include "framebuffer.h"
 #include "misc.h"
 #include "renderbuffer.h"
@@ -111,13 +111,20 @@ void Framebuffer::update_attachment(unsigned mask) const
                }
 
                if(color_bufs.empty())
+               {
                        glDrawBuffer(GL_NONE);
+                       glReadBuffer(GL_NONE);
+               }
                else if(color_bufs.size()==1)
+               {
                        glDrawBuffer(color_bufs.front());
+                       glReadBuffer(color_bufs.front());
+               }
                else
                {
                        static Require _req(ARB_draw_buffers);
                        glDrawBuffers(color_bufs.size(), &color_bufs[0]);
+                       glReadBuffer(color_bufs.front());
                }
        }
        else
@@ -272,7 +279,7 @@ void Framebuffer::bind() const
 }
 
 const Framebuffer *Framebuffer::current()
-{      
+{
        if(!cur_obj)
                cur_obj = &system();
        return cur_obj;