X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fframebuffer.cpp;h=01a4107494387cac61ce8c46e90dd7234e07d5b4;hb=d6122b75b00c0889a54536b5cea971d08184af8f;hp=ffd92a22f8329e05b2c604802d05467a3065f555;hpb=fc55a95ad69fbaaefde3071712bf36a470970bc0;p=libs%2Fgl.git

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index ffd92a22..01a41074 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -1,5 +1,7 @@
 #include <msp/gl/extensions/arb_draw_buffers.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_internalformat_query.h>
+#include <msp/gl/extensions/arb_internalformat_query2.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
 #include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/gl/extensions/ext_texture3d.h>
@@ -32,6 +34,24 @@ Framebuffer::Framebuffer(unsigned i):
 	if(id)
 		throw invalid_argument("System framebuffer must have id 0");
 
+	if(EXT_framebuffer_object)
+	{
+		int value;
+		glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_BACK, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value);
+		if(value==GL_NONE)
+			glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_FRONT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value);
+		if(value!=GL_NONE)
+			format = (format,COLOR_ATTACHMENT);
+
+		glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value);
+		if(value!=GL_NONE)
+			format = (format,DEPTH_ATTACHMENT);
+
+		glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_STENCIL, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value);
+		if(value!=GL_NONE)
+			format = (format,STENCIL_ATTACHMENT);
+	}
+
 	int view[4];
 	glGetIntegerv(GL_VIEWPORT, view);
 	width = view[2];
@@ -78,11 +98,24 @@ Framebuffer::~Framebuffer()
 
 void Framebuffer::set_format(const FrameFormat &fmt)
 {
-	if(!format.empty())
+	if(!format.empty() || !id)
 		throw invalid_operation("Framebuffer::set_format");
 	if(fmt.empty())
 		throw invalid_argument("Framebuffer::set_format");
 
+	if(ARB_internalformat_query && ARB_internalformat_query2)
+	{
+		unsigned target = (fmt.get_samples()>1 ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D);
+		for(FrameAttachment a: fmt)
+		{
+			unsigned pf = get_gl_pixelformat(get_attachment_pixelformat(a));
+			int supported = 0;
+			glGetInternalformativ(target, pf, GL_FRAMEBUFFER_RENDERABLE, 1, &supported);
+			if(supported!=GL_FULL_SUPPORT)
+				throw invalid_argument("Framebuffer::set_format");
+		}
+	}
+
 	format = fmt;
 	attachments.resize(format.size());
 }