X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=3460bc724c30905a05759a3f51046bac720eb306;hp=9a50b8f6f405648ff7b857af03f394b4a85d2eb7;hb=74c995a4ce89d52100f2e9967f61a719a8affe67;hpb=1509585cd1adcf7cff7beecc72e953583a2ea07e

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 9a50b8f6..3460bc72 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include "blend.h"
+#include "error.h"
 #include "framebuffer.h"
 #include "lighting.h"
 #include "postprocessor.h"
@@ -13,32 +14,45 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence(unsigned w, unsigned h, bool d)
+Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f)
 {
-	init(w, h);
-	hdr = d;
+	init(w, h, f);
 }
 
-Sequence::Sequence(const View &view)
+Sequence::Sequence(const View &view, const FrameFormat &f)
 {
-	init(view.get_width(), view.get_height());
+	init(view.get_width(), view.get_height(), f);
 }
 
-Sequence::Sequence(const Framebuffer &fbo)
+Sequence::Sequence(const Framebuffer &fbo, const FrameFormat &f)
 {
-	init(fbo.get_width(), fbo.get_height());
+	init(fbo.get_width(), fbo.get_height(), f);
 }
 
-void Sequence::init(unsigned w, unsigned h)
+void Sequence::init(unsigned w, unsigned h, const FrameFormat &f)
 {
 	width = w;
 	height = h;
-	hdr = false;
-	alpha = false;
-	samples = 0;
-	target_ms = 0;
-	target[0] = 0;
-	target[1] = 0;
+	target_format = f;
+
+	if(!target_format.empty())
+	{
+		FrameFormat postproc_fmt = target_format;
+		postproc_fmt.set_samples(1);
+		target[0] = new RenderTarget(width, height, postproc_fmt);
+		target[1] = new RenderTarget(width, height, postproc_fmt);
+
+		if(target_format.get_samples()>1)
+			target_ms = new RenderTarget(width, height, target_format);
+		else
+			target_ms = 0;
+	}
+	else
+	{
+		target_ms = 0;
+		target[0] = 0;
+		target[1] = 0;
+	}
 }
 
 Sequence::~Sequence()
@@ -51,60 +65,6 @@ Sequence::~Sequence()
 	delete target_ms;
 }
 
-void Sequence::set_hdr(bool h)
-{
-	if(h==hdr)
-		return;
-
-	bool old_hdr = hdr;
-	hdr = h;
-	try
-	{
-		create_targets(2);
-	}
-	catch(...)
-	{
-		hdr = old_hdr;
-		throw;
-	}
-}
-
-void Sequence::set_alpha(bool a)
-{
-	if(a==alpha)
-		return;
-
-	bool old_alpha = alpha;
-	alpha = a;
-	try
-	{
-		create_targets(2);
-	}
-	catch(...)
-	{
-		alpha = old_alpha;
-		throw;
-	}
-}
-
-void Sequence::set_multisample(unsigned s)
-{
-	if(s==samples)
-		return;
-
-	unsigned old_samples = samples;
-	samples = s;
-	try
-	{
-		create_targets(1);
-	}
-	catch(...)
-	{
-		samples = old_samples;
-		throw;
-	}
-}
-
 Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
 {
 	steps.push_back(Step(tag, &r));
@@ -123,18 +83,13 @@ void Sequence::add_postprocessor_owned(PostProcessor *pp)
 
 void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
 {
-	postproc.push_back(PostProcStep(pp, owned));
-	try
-	{
-		create_targets(0);
-	}
-	catch(...)
+	if(target_format.empty())
 	{
 		if(owned)
 			delete pp;
-		postproc.pop_back();
-		throw;
+		throw invalid_operation("Sequence::add_postprocessor");
 	}
+	postproc.push_back(PostProcStep(pp, owned));
 }
 
 void Sequence::setup_frame(Renderer &renderer)
@@ -162,7 +117,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 	if(target[0])
 	{
-		renderer.set_framebuffer(&(samples ? target_ms : target[0])->get_framebuffer());
+		renderer.set_framebuffer(&(target_ms ? target_ms : target[0])->get_framebuffer());
 		renderer.clear();
 	}
 
@@ -184,7 +139,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 	if(target[0])
 	{
-		if(samples)
+		if(target_ms)
 			renderer.resolve_multisample(target[0]->get_framebuffer(), COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 
 		renderer.set_depth_test(0);
@@ -202,59 +157,16 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 	}
 }
 
-void Sequence::create_targets(unsigned recreate)
-{
-	if(recreate>=2)
-	{
-		delete target[0];
-		delete target[1];
-		target[0] = 0;
-		target[1] = 0;
-	}
-	if(recreate>=1)
-	{
-		delete target_ms;
-		target_ms = 0;
-	}
-
-	PixelFormat color_pf = (hdr ? (alpha ? RGBA16F : RGB16F) : (alpha ? RGBA8 : RGB8));
-	FrameFormat fmt = (COLOR_ATTACHMENT,color_pf, DEPTH_ATTACHMENT);
-	if(!postproc.empty() || samples)
-	{
-		if(!target[0])
-			target[0] = new RenderTarget(width, height, fmt);
-		if(!target[1] && postproc.size()>1)
-			target[1] = new RenderTarget(width, height, fmt);
-	}
-
-	if(!target_ms && samples)
-		target_ms = new RenderTarget(width, height, fmt.set_samples(samples));
-
-#ifdef DEBUG
-	if(!debug_name.empty())
-		set_target_debug_names();
-#endif
-}
-
 void Sequence::set_debug_name(const string &name)
 {
-#ifdef DEBUG
-	debug_name = name;
-	if(!name.empty())
-		set_target_debug_names();
-#else
-	(void)name;
-#endif
-}
-
-void Sequence::set_target_debug_names()
-{
 #ifdef DEBUG
 	for(unsigned i=0; i<2; ++i)
 		if(target[i])
-			target[i]->set_debug_name(format("%s [RT:%d]", debug_name, i));
+			target[i]->set_debug_name(format("%s [RT:%d]", name, i));
 	if(target_ms)
-		target_ms->set_debug_name(debug_name+" [RT:ms]");
+		target_ms->set_debug_name(name+" [RT:ms]");
+#else
+	(void)name;
 #endif
 }