X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fframebuffer.cpp;h=a80ea62b223830226f457f8e63135b3f9c77a857;hb=ac51b8c24d6e9e2c2e1dee7822f3957917722000;hp=f4e5a9445e0bce678292c6da327995daef70cc0a;hpb=e0a2e7643f490bee69dfada6b029c8e02e6ede07;p=libs%2Fgl.git

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index f4e5a944..a80ea62b 100644
--- 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,48 +81,50 @@ Framebuffer::~Framebuffer()
 
 void Framebuffer::update_attachment(unsigned mask) const
 {
-	if(current()==this)
+	if(current()!=this)
 	{
-		std::vector<GLenum> color_bufs;
-		color_bufs.reserve(attachments.size());
-		for(unsigned i=0; i<attachments.size(); ++i)
+		dirty |= mask;
+		return;
+	}
+
+	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.size()>1)
-			static Require _req(ARB_draw_buffers);
+		if(attch.attachment>=COLOR_ATTACHMENT0 && attch.attachment<=COLOR_ATTACHMENT3)
+			color_bufs.push_back(attch.attachment);
+	}
+
+	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
-			glDrawBuffer(first_buffer);
+	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);
-	}
-	else
-		dirty |= mask;
 }
 
 void Framebuffer::check_size()