Refactor Framebuffer::update_attachment for less indentation

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

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index 8c618ce51b7112ba96f4332cb1e08de683744397..a80ea62b223830226f457f8e63135b3f9c77a857 100644 (file)
--- a/source/framebuffer.cpp
+++ b/source/framebuffer.cpp
@@ -1,6 +1,7 @@
 #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 <msp/gl/extensions/msp_draw_buffer.h>
 #include "error.h"
 #include "framebuffer.h"
 #include "misc.h"
@@ -80,54 +81,50 @@ Framebuffer::~Framebuffer()
 
 void Framebuffer::update_attachment(unsigned mask) const
 {
-       if(current()==this)
+       if(current()!=this)
+       {
+               dirty |= mask;
+               return;
+       }
+
+       std::vector<GLenum> color_bufs;
+       color_bufs.reserve(attachments.size());
+       for(unsigned i=0; i<attachments.size(); ++i)
        {
-               std::vector<GLenum> color_bufs;
-               color_bufs.reserve(attachments.size());
-               for(unsigned i=0; i<attachments.size(); ++i)
+               const Attachment &attch = attachments[i];
+               if(mask&(1<<i))
                {
-                       const Attachment &attch = attachments[i];
-                       if(mask&(1<<i))
+                       if(attch.type==GL_RENDERBUFFER)
+                               glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, GL_RENDERBUFFER, attch.rbuf->get_id());
+                       else if(attch.type==GL_TEXTURE_2D)
                        {
-                               if(attch.type==GL_RENDERBUFFER)
-                                       glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, GL_RENDERBUFFER, attch.rbuf->get_id());
-                               else if(attch.type==GL_TEXTURE_2D)
-                               {
-                                       static_cast<Texture2D *>(attch.tex)->allocate(attch.level);
-                                       glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.type, attch.tex->get_id(), attch.level);
-                               }
-                               else if(attch.type==GL_TEXTURE_CUBE_MAP)
-                               {
-                                       static_cast<TextureCube *>(attch.tex)->allocate(attch.level);
-                                       glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.cube_face, attch.tex->get_id(), attch.level);
-                               }
-                               else
-                                       glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, 0, 0);
+                               static_cast<Texture2D *>(attch.tex)->allocate(attch.level);
+                               glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.type, attch.tex->get_id(), attch.level);
                        }
-
-                       if(attch.attachment>=COLOR_ATTACHMENT0 && attch.attachment<=COLOR_ATTACHMENT3)
-                               color_bufs.push_back(attch.attachment);
+                       else if(attch.type==GL_TEXTURE_CUBE_MAP)
+                       {
+                               static_cast<TextureCube *>(attch.tex)->allocate(attch.level);
+                               glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.cube_face, attch.tex->get_id(), attch.level);
+                       }
+                       else
+                               glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, 0, 0);
                }
 
-               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());
-               }
+               if(attch.attachment>=COLOR_ATTACHMENT0 && attch.attachment<=COLOR_ATTACHMENT3)
+                       color_bufs.push_back(attch.attachment);
        }
-       else
-               dirty |= mask;
+
+       if(color_bufs.size()>1)
+               static Require _req(ARB_draw_buffers);
+
+       GLenum first_buffer = (color_bufs.empty() ? GL_NONE : color_bufs.front());
+       if(ARB_draw_buffers)
+               glDrawBuffers(color_bufs.size(), &color_bufs[0]);
+       else if(MSP_draw_buffer)
+               glDrawBuffer(first_buffer);
+
+       if(MSP_draw_buffer)
+               glReadBuffer(first_buffer);
 }
 
 void Framebuffer::check_size()