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

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index 4d6c1752..a80ea62b 100644
--- a/source/framebuffer.cpp
+++ b/source/framebuffer.cpp
@@ -1,7 +1,8 @@
-#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 <msp/gl/extensions/msp_draw_buffer.h>
 #include "error.h"
-#include "ext_framebuffer_blit.h"
-#include "ext_framebuffer_object.h"
 #include "framebuffer.h"
 #include "misc.h"
 #include "renderbuffer.h"
@@ -55,10 +56,9 @@ Framebuffer::Framebuffer(unsigned i):
 	if(id)
 		throw invalid_argument("System framebuffer must have id 0");
 
-	int viewport[4];
-	glGetIntegerv(GL_VIEWPORT, viewport);
-	width = viewport[2];
-	height = viewport[3];
+	glGetIntegerv(GL_VIEWPORT, &view.left);
+	width = view.width;
+	height = view.height;
 }
 
 Framebuffer::Framebuffer():
@@ -81,51 +81,55 @@ 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);
-		else if(color_bufs.size()==1)
-			glDrawBuffer(color_bufs.front());
-		else
-		{
-			static Require _req(ARB_draw_buffers);
-			glDrawBuffers(color_bufs.size(), &color_bufs[0]);
-		}
+		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()
 {
+	bool full_viewport = (view.left==0 && view.bottom==0 && view.width==width && view.height==height);
 	for(vector<Attachment>::iterator i=attachments.begin(); i!=attachments.end(); ++i)
 		if(i->type)
 		{
@@ -145,8 +149,8 @@ void Framebuffer::check_size()
 				width = static_cast<TextureCube *>(i->tex)->get_size();
 				height = width;
 			}
-			if(current()==this)
-				glViewport(0, 0, width, height);
+			if(full_viewport)
+				reset_viewport();
 			break;
 		}
 }
@@ -206,7 +210,7 @@ void Framebuffer::detach(FramebufferAttachment attch)
 
 FramebufferStatus Framebuffer::check_status() const
 {
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	return static_cast<FramebufferStatus>(glCheckFramebufferStatus(GL_FRAMEBUFFER));
 }
 
@@ -217,9 +221,25 @@ void Framebuffer::require_complete() const
 		throw framebuffer_incomplete(status);
 }
 
+void Framebuffer::viewport(int l, int b, unsigned w, unsigned h)
+{
+	view.left = l;
+	view.bottom = b;
+	view.width = w;
+	view.height = h;
+
+	if(current()==this)
+		glViewport(view.left, view.bottom, view.width, view.height);
+}
+
+void Framebuffer::reset_viewport()
+{
+	viewport(0, 0, width, height);
+}
+
 void Framebuffer::clear(BufferBits bits)
 {
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glClear(bits);
 }
 
@@ -266,13 +286,14 @@ void Framebuffer::bind() const
 			update_attachment(dirty);
 			dirty = 0;
 		}
+
 		if(width && height)
-			glViewport(0, 0, width, height);
+			glViewport(view.left, view.bottom, view.width, view.height);
 	}
 }
 
 const Framebuffer *Framebuffer::current()
-{	
+{
 	if(!cur_obj)
 		cur_obj = &system();
 	return cur_obj;
@@ -316,5 +337,13 @@ void Framebuffer::Attachment::clear()
 	type = 0;
 }
 
+
+Framebuffer::Viewport::Viewport():
+	left(0),
+	bottom(0),
+	width(0),
+	height(0)
+{ }
+
 } // namespace GL
 } // namespace Msp