X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fframebuffer.cpp;h=cf478ce29b686d842ce2074078952633b2e47b02;hp=c7bfcd5a5808120088bb72cc2c9a589742186b66;hb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;hpb=751c171a97a67f3c2077e120492746babde1d43c

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index c7bfcd5a..cf478ce2 100644
--- a/source/framebuffer.cpp
+++ b/source/framebuffer.cpp
@@ -3,7 +3,8 @@
 #include <msp/gl/extensions/ext_framebuffer_blit.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
 #include <msp/gl/extensions/ext_texture_array.h>
-#include <msp/gl/extensions/msp_draw_buffer.h>
+#include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/gl/extensions/msp_buffer_control.h>
 #include "error.h"
 #include "framebuffer.h"
 #include "misc.h"
@@ -38,6 +39,15 @@ void operator<<(LexicalConverter &conv, FramebufferStatus status)
 	case FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
 		conv.result("missing read buffer attachment");
 		break;
+	case FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+		conv.result("mismatched attachment sample counts");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_LAYER_COUNT:
+		conv.result("mismatched attachment layer counts");
+		break;
+	case FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
+		conv.result("mismatched attachment layering");
+		break;
 	case FRAMEBUFFER_UNSUPPORTED:
 		conv.result("unsupported");
 		break;
@@ -158,10 +168,10 @@ void Framebuffer::update_attachment(unsigned mask) const
 	{
 		if(ARB_draw_buffers)
 			glDrawBuffers(color_bufs.size(), &color_bufs[0]);
-		else if(MSP_draw_buffer)
+		else if(MSP_buffer_control)
 			glDrawBuffer(first_buffer);
 
-		if(MSP_draw_buffer)
+		if(MSP_buffer_control)
 			glReadBuffer(first_buffer);
 	}
 }