X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fframebuffer.cpp;h=45eaff656b65322a5d137133061e9e2ce35924ac;hp=6e7d9dc9971878a7647f26ecf49be6f10fd54712;hb=HEAD;hpb=2e1a887ef0d4a0af8b8aa781619cff6d75692e14

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 6e7d9dc9..4f30dbb1 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -1,13 +1,5 @@
-#include <msp/gl/extensions/arb_draw_buffers.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/ext_framebuffer_object.h>
-#include <msp/gl/extensions/ext_texture_array.h>
-#include <msp/gl/extensions/ext_texture3d.h>
-#include <msp/gl/extensions/msp_buffer_control.h>
-#include <msp/gl/extensions/khr_debug.h>
 #include "error.h"
 #include "framebuffer.h"
-#include "misc.h"
 #include "texture2d.h"
 #include "texture2dmultisample.h"
 #include "texture3d.h"
@@ -18,294 +10,156 @@ 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_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;
-	default:
-		conv.result(lexical_cast<string, unsigned>(status, "%#x"));
-		break;
-	}
-}
-
-framebuffer_incomplete::framebuffer_incomplete(FramebufferStatus status):
-	runtime_error(lexical_cast<string>(status))
+framebuffer_incomplete::framebuffer_incomplete(const std::string &reason):
+	runtime_error(reason)
 { }
 
 
-Framebuffer::Framebuffer(unsigned i):
-	id(i),
-	status(FRAMEBUFFER_COMPLETE),
-	dirty(0)
-{
-	if(id)
-		throw invalid_argument("System framebuffer must have id 0");
-
-	int view[4];
-	glGetIntegerv(GL_VIEWPORT, view);
-	width = view[2];
-	height = view[3];
-}
+Framebuffer::Framebuffer(bool s):
+	FramebufferBackend(s)
+{ }
 
-Framebuffer::Framebuffer()
-{
-	init();
-}
+Framebuffer::Framebuffer():
+	FramebufferBackend(false)
+{ }
 
-Framebuffer::Framebuffer(FrameAttachment fa)
+Framebuffer::Framebuffer(FrameAttachment fa):
+	Framebuffer()
 {
-	init();
 	set_format(fa);
 }
 
-Framebuffer::Framebuffer(const FrameFormat &f)
+Framebuffer::Framebuffer(const FrameFormat &f):
+	Framebuffer()
 {
-	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
-		glGenFramebuffers(1, &id);
-}
-
-Framebuffer::~Framebuffer()
-{
-	if(id)
-		glDeleteFramebuffers(1, &id);
-}
-
 void Framebuffer::set_format(const FrameFormat &fmt)
 {
 	if(!format.empty())
 		throw invalid_operation("Framebuffer::set_format");
-	if(fmt.empty())
+	if(fmt.empty() || !is_format_supported(fmt))
 		throw invalid_argument("Framebuffer::set_format");
 
 	format = fmt;
 	attachments.resize(format.size());
+	format_changed(format);
 }
 
 void Framebuffer::update() const
 {
-	vector<GLenum> color_bufs;
-	color_bufs.reserve(format.size());
-	unsigned i = 0;
-	for(const UInt16 *j=format.begin(); j!=format.end(); ++j, ++i)
-	{
-		GLenum gl_attach_point = get_gl_attachment(static_cast<FrameAttachment>(*j));
-		if(dirty&(1<<i))
-		{
-			const Attachment &attch = attachments[i];
-			if(attch.tex)
-			{
-				GLenum type = attch.tex->get_target();
-				if(ARB_direct_state_access)
-				{
-					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, gl_attach_point, attch.tex->get_id(), attch.level, attch.layer);
-				}
-				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, 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)
-				glNamedFramebufferTexture(id, gl_attach_point, 0, 0);
-			else
-				glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, GL_TEXTURE_2D, 0, 0);
-		}
-
-		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)
-		static Require _req(ARB_draw_buffers);
-
-	GLenum first_buffer = (color_bufs.empty() ? GL_NONE : color_bufs.front());
-	if(ARB_direct_state_access)
-	{
-		/* ARB_direct_state_access ties the availability of these functions to
-		framebuffers themselves, so no further checks are needed. */
-		glNamedFramebufferDrawBuffers(id, color_bufs.size(), &color_bufs[0]);
-		glNamedFramebufferReadBuffer(id, first_buffer);
-	}
-	else
-	{
-		if(ARB_draw_buffers)
-			glDrawBuffers(color_bufs.size(), &color_bufs[0]);
-		else if(MSP_buffer_control)
-			glDrawBuffer(first_buffer);
-
-		if(MSP_buffer_control)
-			glReadBuffer(first_buffer);
-	}
-
-	if(ARB_direct_state_access)
-		status = static_cast<FramebufferStatus>(glCheckNamedFramebufferStatus(id, GL_FRAMEBUFFER));
-	else
-		status = static_cast<FramebufferStatus>(glCheckFramebufferStatus(GL_FRAMEBUFFER));
-
+	FramebufferBackend::update(dirty);
 	dirty = 0;
 }
 
 void Framebuffer::check_size()
 {
 	bool first = true;
-	for(vector<Attachment>::iterator i=attachments.begin(); i!=attachments.end(); ++i)
-		if(i->tex)
+	for(Attachment &a: attachments)
+		if(a.tex)
 		{
-			GLenum type = i->tex->get_target();
 			unsigned w = 0;
 			unsigned h = 0;
-			if(type==GL_TEXTURE_2D)
+			unsigned l = 1;
+			if(const Texture2D *tex2d = dynamic_cast<const Texture2D *>(a.tex))
 			{
-				Texture2D *tex = static_cast<Texture2D *>(i->tex);
-				w = max(tex->get_width()>>i->level, 1U);
-				h = max(tex->get_height()>>i->level, 1U);
+				w = max(tex2d->get_width()>>a.level, 1U);
+				h = max(tex2d->get_height()>>a.level, 1U);
 			}
-			else if(type==GL_TEXTURE_2D_MULTISAMPLE)
+			else if(const Texture2DMultisample *tex2d_ms = dynamic_cast<const Texture2DMultisample *>(a.tex))
 			{
-				Texture2DMultisample *tex = static_cast<Texture2DMultisample *>(i->tex);
-				w = tex->get_width();
-				h = tex->get_height();
+				w = tex2d_ms->get_width();
+				h = tex2d_ms->get_height();
 			}
-			else if(type==GL_TEXTURE_3D || type==GL_TEXTURE_2D_ARRAY)
+			else if(const Texture3D *tex3d = dynamic_cast<const Texture3D *>(a.tex))
 			{
-				Texture3D *tex = static_cast<Texture3D *>(i->tex);
-				w = max(tex->get_width()>>i->level, 1U);
-				h = max(tex->get_height()>>i->level, 1U);
+				w = max(tex3d->get_width()>>a.level, 1U);
+				h = max(tex3d->get_height()>>a.level, 1U);
+				l = (a.layer<0 ? tex3d->get_depth() : 1);
 			}
-			else if(type==GL_TEXTURE_CUBE_MAP)
+			else if(const TextureCube *tex_cube = dynamic_cast<const TextureCube *>(a.tex))
 			{
-				w = max(static_cast<TextureCube *>(i->tex)->get_size()>>i->level, 1U);
+				w = max(tex_cube->get_size()>>a.level, 1U);
 				h = w;
+				l = (a.layer<0 ? 6 : 1);
 			}
 
 			if(first)
 			{
 				width = w;
 				height = h;
+				layers = l;
 				first = false;
 			}
 			else
 			{
 				width = min(width, w);
 				height = min(height, h);
+				layers = min(layers, l);
 			}
 		}
 }
 
-void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned level, int layer, unsigned samples)
+void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, Texture *res, unsigned level, int layer, unsigned samples)
 {
-	if(format.empty() || !id)
+	if(format.empty() || attachments.empty())
 		throw invalid_operation("Framebuffer::attach");
 
 	if((format.get_samples()>1 && samples!=format.get_samples()) || (format.get_samples()==1 && samples))
 		throw incompatible_data("Framebuffer::attach");
 
 	unsigned i = 0;
-	for(const UInt16 *j=format.begin(); j!=format.end(); ++j, ++i)
-		if(*j==attch)
+	for(FrameAttachment a: format)
+	{
+		if(a==attch)
 		{
-			attachments[i].set(tex, level, layer);
+			attachments[i].set(tex, res, level, layer);
 			dirty |= 1<<i;
 			check_size();
 			return;
 		}
+		++i;
+	}
 
 	throw incompatible_data("Framebuffer::attach");
 }
 
 void Framebuffer::attach(FrameAttachment attch, Texture2D &tex, unsigned level)
 {
-	tex.allocate(level);
-	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, 0, 0);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, level, 0, 0);
 }
 
-void Framebuffer::attach(FrameAttachment attch, Texture2DMultisample &tex)
+void Framebuffer::attach(FrameAttachment attch, Texture2DMultisample &tex, Texture2D *res)
 {
-	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, 0, tex.get_samples());
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, res, 0, 0, tex.get_samples());
 }
 
 void Framebuffer::attach(FrameAttachment attch, Texture3D &tex, unsigned layer, unsigned level)
 {
-	tex.allocate(level);
-	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, layer, 0);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, level, layer, 0);
 }
 
 void Framebuffer::attach(FrameAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level)
 {
-	tex.allocate(level);
-	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, TextureCube::get_face_index(face), 0);
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, level, face, 0);
 }
 
 void Framebuffer::attach_layered(FrameAttachment attch, Texture3D &tex, unsigned level)
 {
-	static Require _req(ARB_geometry_shader4);
-	tex.allocate(level);
-	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, -1, 0);
+	require_layered();
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, level, -1, 0);
 }
 
 void Framebuffer::attach_layered(FrameAttachment attch, TextureCube &tex, unsigned level)
 {
-	static Require _req(ARB_geometry_shader4);
-	tex.allocate(level);
-	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, -1, 0);
+	require_layered();
+	set_attachment(make_typed_attachment(attch, tex.get_format()), tex, 0, level, -1, 0);
 }
 
 void Framebuffer::detach(FrameAttachment attch)
 {
-	if(!id)
+	if(attachments.empty())
 		throw invalid_operation("Framebuffer::detach");
 
 	int i = format.index(attch);
@@ -317,47 +171,61 @@ void Framebuffer::detach(FrameAttachment attch)
 	}
 }
 
-void Framebuffer::resize(const WindowView &view)
+const Texture *Framebuffer::get_attachment(FrameAttachment attch) const
 {
-	if(id)
-		throw invalid_operation("Framebuffer::resize");
+	if(attachments.empty())
+		return 0;
 
-	width = view.get_width();
-	height = view.get_height();
+	int i = format.index(attch);
+	return (i>=0 ? attachments[i].tex : 0);
 }
 
-void Framebuffer::require_complete() const
+const Texture *Framebuffer::get_attachment(unsigned i) const
 {
-	if(status!=FRAMEBUFFER_COMPLETE)
-		throw framebuffer_incomplete(status);
+	return (i<attachments.size() ? attachments[i].tex : 0);
 }
 
-void Framebuffer::set_debug_name(const string &name)
+const Texture *Framebuffer::get_resolve_attachment(FrameAttachment attch) const
 {
-#ifdef DEBUG
-	if(KHR_debug)
-		glObjectLabel(GL_FRAMEBUFFER, id, name.size(), name.c_str());
-#else
-	(void)name;
-#endif
+	if(attachments.empty())
+		return 0;
+
+	int i = format.index(attch);
+	return (i>=0 ? attachments[i].resolve : 0);
 }
 
-Framebuffer &Framebuffer::system()
+const Texture *Framebuffer::get_resolve_attachment(unsigned i) const
 {
-	static Framebuffer sys_framebuf(0);
-	return sys_framebuf;
+	return (i<attachments.size() ? attachments[i].resolve : 0);
 }
 
+bool Framebuffer::has_resolve_attachments() const
+{
+	for(const Attachment &a: attachments)
+		if(a.resolve)
+			return true;
+	return false;
+}
+
+void Framebuffer::require_complete() const
+{
+	bool layered = (!attachments.empty() && attachments.front().layer<0);
+	for(const Attachment &a: attachments)
+	{
+		if(!a.tex)
+			throw framebuffer_incomplete("missing attachment");
+		if(layered!=(a.layer<0))
+			throw framebuffer_incomplete("inconsistent layering");
+	}
+
+	FramebufferBackend::require_complete();
+}
 
-Framebuffer::Attachment::Attachment():
-	tex(0),
-	level(0),
-	layer(0)
-{ }
 
-void Framebuffer::Attachment::set(Texture &t, unsigned l, int z)
+void Framebuffer::Attachment::set(Texture &t, Texture *r, unsigned l, int z)
 {
 	tex = &t;
+	resolve = r;
 	level = l;
 	layer = z;
 }