X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fframebuffer.cpp;h=ae8f4dd471a936881f77e8e569de8e97ba5bc8c0;hb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3;hp=98722195e32e8b10d40a43ab3d458d4c1ae5f4af;hpb=e1df3aa732d4d2d03f6ac72a8dead099937a0468;p=libs%2Fgl.git

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index 98722195..ae8f4dd4 100644
--- 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"
@@ -12,6 +12,42 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+void operator<<(LexicalConverter &conv, FramebufferStatus status)
+{
+	switch(status)
+	{
+	case FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+		conv.result("incomplete attachment");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+		conv.result("missing attachment");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+		conv.result("mismatched attachment dimensions");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_FORMATS:
+		conv.result("mismatched attachment formats");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+		conv.result("missing draw buffer attachment");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+		conv.result("missing read buffer attachment");
+		break;
+	case FRAMEBUFFER_UNSUPPORTED:
+		conv.result("unsupported");
+		break;
+	default:
+		conv.result(lexical_cast<string, unsigned>(status, "%#x"));
+		break;
+	}
+}
+
+framebuffer_incomplete::framebuffer_incomplete(FramebufferStatus status):
+	runtime_error(lexical_cast<string>(status))
+{ }
+
+
 Framebuffer::Framebuffer(unsigned i):
 	id(i),
 	dirty(0)
@@ -75,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
@@ -174,6 +217,13 @@ FramebufferStatus Framebuffer::check_status() const
 	return static_cast<FramebufferStatus>(glCheckFramebufferStatus(GL_FRAMEBUFFER));
 }
 
+void Framebuffer::require_complete() const
+{
+	FramebufferStatus status = check_status();
+	if(status!=FRAMEBUFFER_COMPLETE)
+		throw framebuffer_incomplete(status);
+}
+
 void Framebuffer::clear(BufferBits bits)
 {
 	Bind _bind(this, true);
@@ -229,7 +279,7 @@ void Framebuffer::bind() const
 }
 
 const Framebuffer *Framebuffer::current()
-{	
+{
 	if(!cur_obj)
 		cur_obj = &system();
 	return cur_obj;