X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fframebuffer.cpp;h=e9d8863ca16e4e0379a11e9777def136cb596d2e;hp=4dbb30929e05dc38ff822c981b51e251613f61bb;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 4dbb3092..e9d8863c 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -8,8 +8,8 @@
 #include "error.h"
 #include "framebuffer.h"
 #include "misc.h"
-#include "renderbuffer.h"
 #include "texture2d.h"
+#include "texture2dmultisample.h"
 #include "texture3d.h"
 #include "windowview.h"
 
@@ -77,14 +77,32 @@ Framebuffer::Framebuffer(unsigned i):
 	height = view[3];
 }
 
-Framebuffer::Framebuffer():
-	width(0),
-	height(0),
-	status(FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
-	dirty(0)
+Framebuffer::Framebuffer()
+{
+	init();
+}
+
+Framebuffer::Framebuffer(FrameAttachment fa)
+{
+	init();
+	set_format(fa);
+}
+
+Framebuffer::Framebuffer(const FrameFormat &f)
+{
+	init();
+	set_format(f);
+}
+
+void Framebuffer::init()
 {
 	static Require _req(EXT_framebuffer_object);
 
+	width = 0;
+	height = 0;
+	status = FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT;
+	dirty = 0;
+
 	if(ARB_direct_state_access)
 		glCreateFramebuffers(1, &id);
 	else
@@ -97,50 +115,57 @@ Framebuffer::~Framebuffer()
 		glDeleteFramebuffers(1, &id);
 }
 
+void Framebuffer::set_format(const FrameFormat &fmt)
+{
+	if(!format.empty())
+		throw invalid_operation("Framebuffer::set_format");
+	if(fmt.empty())
+		throw invalid_argument("Framebuffer::set_format");
+
+	format = fmt;
+	attachments.resize(format.size());
+}
+
 void Framebuffer::update() const
 {
 	vector<GLenum> color_bufs;
-	color_bufs.reserve(attachments.size());
-	for(unsigned i=0; i<attachments.size(); ++i)
+	color_bufs.reserve(format.size());
+	unsigned i = 0;
+	for(const uint16_t *j=format.begin(); j!=format.end(); ++j, ++i)
 	{
-		const Attachment &attch = attachments[i];
+		GLenum gl_attach_point = get_gl_attachment(static_cast<FrameAttachment>(*j));
 		if(dirty&(1<<i))
 		{
-			if(attch.type==GL_RENDERBUFFER)
-			{
-				if(ARB_direct_state_access)
-					glNamedFramebufferRenderbuffer(id, attch.attachment, GL_RENDERBUFFER, attch.rbuf->get_id());
-				else
-					glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, GL_RENDERBUFFER, attch.rbuf->get_id());
-			}
-			else if(attch.type)
+			const Attachment &attch = attachments[i];
+			if(attch.tex)
 			{
+				GLenum type = attch.tex->get_target();
 				if(ARB_direct_state_access)
 				{
-					if(attch.type==GL_TEXTURE_2D || attch.layer<0)
-						glNamedFramebufferTexture(id, attch.attachment, attch.tex->get_id(), attch.level);
+					if(type==GL_TEXTURE_2D || type==GL_TEXTURE_2D_MULTISAMPLE || attch.layer<0)
+						glNamedFramebufferTexture(id, gl_attach_point, attch.tex->get_id(), attch.level);
 					else
-						glNamedFramebufferTextureLayer(id, attch.attachment, attch.tex->get_id(), attch.level, attch.layer);
+						glNamedFramebufferTextureLayer(id, gl_attach_point, attch.tex->get_id(), attch.level, attch.layer);
 				}
-				else if(attch.type==GL_TEXTURE_2D)
-					glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.type, attch.tex->get_id(), attch.level);
+				else if(type==GL_TEXTURE_2D || type==GL_TEXTURE_2D_MULTISAMPLE)
+					glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, type, attch.tex->get_id(), attch.level);
 				else if(attch.layer<0)
-					glFramebufferTexture(GL_FRAMEBUFFER, attch.attachment, attch.tex->get_id(), attch.level);
-				else if(attch.type==GL_TEXTURE_2D_ARRAY)
-					glFramebufferTextureLayer(GL_FRAMEBUFFER, attch.attachment, attch.tex->get_id(), attch.level, attch.layer);
-				else if(attch.type==GL_TEXTURE_3D)
-					glFramebufferTexture3D(GL_FRAMEBUFFER, attch.attachment, attch.type, attch.tex->get_id(), attch.level, attch.layer);
-				else if(attch.type==GL_TEXTURE_CUBE_MAP)
-					glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, TextureCube::enumerate_faces(attch.layer), attch.tex->get_id(), attch.level);
+					glFramebufferTexture(GL_FRAMEBUFFER, gl_attach_point, attch.tex->get_id(), attch.level);
+				else if(type==GL_TEXTURE_2D_ARRAY)
+					glFramebufferTextureLayer(GL_FRAMEBUFFER, gl_attach_point, attch.tex->get_id(), attch.level, attch.layer);
+				else if(type==GL_TEXTURE_3D)
+					glFramebufferTexture3D(GL_FRAMEBUFFER, gl_attach_point, type, attch.tex->get_id(), attch.level, attch.layer);
+				else if(type==GL_TEXTURE_CUBE_MAP)
+					glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, TextureCube::enumerate_faces(attch.layer), attch.tex->get_id(), attch.level);
 			}
 			else if(ARB_direct_state_access)
-				glNamedFramebufferRenderbuffer(id, attch.attachment, 0, 0);
+				glNamedFramebufferTexture(id, gl_attach_point, 0, 0);
 			else
-				glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, 0, 0);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, GL_TEXTURE_2D, 0, 0);
 		}
 
-		if(attch.attachment>=COLOR_ATTACHMENT0 && attch.attachment<=COLOR_ATTACHMENT3)
-			color_bufs.push_back(attch.attachment);
+		if(gl_attach_point!=GL_DEPTH_ATTACHMENT && gl_attach_point!=GL_STENCIL_ATTACHMENT)
+			color_bufs.push_back(gl_attach_point);
 	}
 
 	if(color_bufs.size()>1)
@@ -175,107 +200,121 @@ void Framebuffer::update() const
 
 void Framebuffer::check_size()
 {
-	for(vector<Attachment>::iterator i=attachments.begin(); i!=attachments.end(); ++i)
-		if(i->type)
+	bool first = true;
+	for(Attachment &a: attachments)
+		if(a.tex)
 		{
-			if(i->type==GL_RENDERBUFFER)
+			GLenum type = a.tex->get_target();
+			unsigned w = 0;
+			unsigned h = 0;
+			if(type==GL_TEXTURE_2D)
 			{
-				width = i->rbuf->get_width();
-				height = i->rbuf->get_height();
+				Texture2D *tex = static_cast<Texture2D *>(a.tex);
+				w = max(tex->get_width()>>a.level, 1U);
+				h = max(tex->get_height()>>a.level, 1U);
 			}
-			else if(i->type==GL_TEXTURE_2D)
+			else if(type==GL_TEXTURE_2D_MULTISAMPLE)
 			{
-				Texture2D *tex = static_cast<Texture2D *>(i->tex);
-				width = max(tex->get_width()>>i->level, 1U);
-				height = max(tex->get_height()>>i->level, 1U);
+				Texture2DMultisample *tex = static_cast<Texture2DMultisample *>(a.tex);
+				w = tex->get_width();
+				h = tex->get_height();
 			}
-			else if(i->type==GL_TEXTURE_3D || i->type==GL_TEXTURE_2D_ARRAY)
+			else if(type==GL_TEXTURE_3D || type==GL_TEXTURE_2D_ARRAY)
 			{
-				Texture3D *tex = static_cast<Texture3D *>(i->tex);
-				width = max(tex->get_width()>>i->level, 1U);
-				height = max(tex->get_height()>>i->level, 1U);
+				Texture3D *tex = static_cast<Texture3D *>(a.tex);
+				w = max(tex->get_width()>>a.level, 1U);
+				h = max(tex->get_height()>>a.level, 1U);
 			}
-			else if(i->type==GL_TEXTURE_CUBE_MAP)
+			else if(type==GL_TEXTURE_CUBE_MAP)
 			{
-				width = max(static_cast<TextureCube *>(i->tex)->get_size()>>i->level, 1U);
-				height = width;
+				w = max(static_cast<TextureCube *>(a.tex)->get_size()>>a.level, 1U);
+				h = w;
 			}
-			break;
-		}
-}
 
-unsigned Framebuffer::get_attachment_index(FramebufferAttachment attch)
-{
-	for(unsigned i=0; i<attachments.size(); ++i)
-		if(attachments[i].attachment==attch)
-			return i;
-	attachments.push_back(Attachment(attch));
-	return attachments.size()-1;
+			if(first)
+			{
+				width = w;
+				height = h;
+				first = false;
+			}
+			else
+			{
+				width = min(width, w);
+				height = min(height, h);
+			}
+		}
 }
 
-void Framebuffer::set_texture_attachment(FramebufferAttachment attch, Texture &tex, unsigned level, int layer)
+void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned level, int layer, unsigned samples)
 {
-	if(!id)
+	if(format.empty() || !id)
 		throw invalid_operation("Framebuffer::attach");
 
-	unsigned i = get_attachment_index(attch);
-	attachments[i].set(tex, level, layer);
-	dirty |= 1<<i;
-	check_size();
-}
+	if((format.get_samples()>1 && samples!=format.get_samples()) || (format.get_samples()==1 && samples))
+		throw incompatible_data("Framebuffer::attach");
 
-void Framebuffer::attach(FramebufferAttachment attch, Renderbuffer &rbuf)
-{
-	if(!id)
-		throw invalid_operation("Framebuffer::attach");
+	unsigned i = 0;
+	for(const uint16_t *j=format.begin(); j!=format.end(); ++j, ++i)
+		if(*j==attch)
+		{
+			attachments[i].set(tex, level, layer);
+			dirty |= 1<<i;
+			check_size();
+			return;
+		}
 
-	unsigned i = get_attachment_index(attch);
-	attachments[i].set(rbuf);
-	dirty |= 1<<i;
-	check_size();
+	throw incompatible_data("Framebuffer::attach");
 }
 
-void Framebuffer::attach(FramebufferAttachment attch, Texture2D &tex, unsigned level)
+void Framebuffer::attach(FrameAttachment attch, Texture2D &tex, unsigned level)
 {
 	tex.allocate(level);
-	set_texture_attachment(attch, tex, level, 0);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, 0, 0);
+}
+
+void Framebuffer::attach(FrameAttachment attch, Texture2DMultisample &tex)
+{
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, 0, tex.get_samples());
 }
 
-void Framebuffer::attach(FramebufferAttachment attch, Texture3D &tex, unsigned layer, unsigned level)
+void Framebuffer::attach(FrameAttachment attch, Texture3D &tex, unsigned layer, unsigned level)
 {
 	tex.allocate(level);
-	set_texture_attachment(attch, tex, level, layer);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, layer, 0);
 }
 
-void Framebuffer::attach(FramebufferAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level)
+void Framebuffer::attach(FrameAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level)
 {
 	tex.allocate(level);
-	set_texture_attachment(attch, tex, level, TextureCube::get_face_index(face));
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, TextureCube::get_face_index(face), 0);
 }
 
-void Framebuffer::attach_layered(FramebufferAttachment attch, Texture3D &tex, unsigned level)
+void Framebuffer::attach_layered(FrameAttachment attch, Texture3D &tex, unsigned level)
 {
 	static Require _req(ARB_geometry_shader4);
 	tex.allocate(level);
-	set_texture_attachment(attch, tex, level, -1);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, -1, 0);
 }
 
-void Framebuffer::attach_layered(FramebufferAttachment attch, TextureCube &tex, unsigned level)
+void Framebuffer::attach_layered(FrameAttachment attch, TextureCube &tex, unsigned level)
 {
 	static Require _req(ARB_geometry_shader4);
 	tex.allocate(level);
-	set_texture_attachment(attch, tex, level, -1);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, -1, 0);
 }
 
-void Framebuffer::detach(FramebufferAttachment attch)
+void Framebuffer::detach(FrameAttachment attch)
 {
 	if(!id)
 		throw invalid_operation("Framebuffer::detach");
 
-	unsigned i = get_attachment_index(attch);
-	attachments[i].clear();
-	dirty |= 1<<i;
-	check_size();
+	int i = format.index(attch);
+	if(i>=0)
+	{
+		attachments[i].clear();
+		dirty |= 1<<i;
+		check_size();
+	}
 }
 
 void Framebuffer::resize(const WindowView &view)
@@ -310,24 +349,14 @@ Framebuffer &Framebuffer::system()
 }
 
 
-Framebuffer::Attachment::Attachment(FramebufferAttachment a):
-	attachment(a),
-	type(0),
+Framebuffer::Attachment::Attachment():
+	tex(0),
 	level(0),
 	layer(0)
 { }
 
-void Framebuffer::Attachment::set(Renderbuffer &r)
-{
-	type = GL_RENDERBUFFER;
-	rbuf = &r;
-	level = 0;
-	layer = 0;
-}
-
 void Framebuffer::Attachment::set(Texture &t, unsigned l, int z)
 {
-	type = t.get_target();
 	tex = &t;
 	level = l;
 	layer = z;
@@ -335,7 +364,7 @@ void Framebuffer::Attachment::set(Texture &t, unsigned l, int z)
 
 void Framebuffer::Attachment::clear()
 {
-	type = 0;
+	tex = 0;
 }
 
 } // namespace GL