From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 13 Nov 2021 14:59:22 +0000 (+0200)
Subject: Build sequence without target format if there's no postprocessors
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=52122a54426fe3b821680e346b53c961d548c40e;p=libs%2Fgl.git

Build sequence without target format if there's no postprocessors
---

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index c80e2f09..01208cf4 100644
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -146,27 +146,30 @@ Sequence *SequenceBuilder::build() const
 
 Sequence *SequenceBuilder::build(unsigned w, unsigned h) const
 {
-	RefPtr<Sequence> sequence = new Sequence(w, h, create_frame_format());
+	RefPtr<Sequence> sequence = create_sequence(w, h);
 	build(*sequence);
 	return sequence.release();
 }
 
 Sequence *SequenceBuilder::build(const View &view) const
 {
-	RefPtr<Sequence> sequence = new Sequence(view.get_width(), view.get_height(), create_frame_format());
+	RefPtr<Sequence> sequence = create_sequence(view.get_width(), view.get_height());
 	build(*sequence);
 	return sequence.release();
 }
 
 Sequence *SequenceBuilder::build(const Framebuffer &fbo) const
 {
-	RefPtr<Sequence> sequence = new Sequence(fbo.get_width(), fbo.get_height(), create_frame_format());
+	RefPtr<Sequence> sequence = create_sequence(fbo.get_width(), fbo.get_height());
 	build(*sequence);
 	return sequence.release();
 }
 
-FrameFormat SequenceBuilder::create_frame_format() const
+Sequence * SequenceBuilder::create_sequence(unsigned w, unsigned h) const
 {
+	if(!w || !h || tmpl.get_postprocessors().empty())
+		return new Sequence;
+
 	unsigned samples = min(tmpl.get_maximum_multisample(), Device::get_current().get_info().limits.max_samples);
 	if(samples<tmpl.get_required_multisample())
 		throw invalid_operation("SequenceBuilder::create_frame_format");
@@ -174,7 +177,8 @@ FrameFormat SequenceBuilder::create_frame_format() const
 	DataType color_type = (tmpl.get_hdr() ? HALF_FLOAT : UNSIGNED_BYTE);
 	PixelFormat color_pf = make_pixelformat(RGBA, color_type);
 
-	return (COLOR_ATTACHMENT,color_pf, DEPTH_ATTACHMENT).set_samples(samples);
+	FrameFormat format = (COLOR_ATTACHMENT,color_pf, DEPTH_ATTACHMENT).set_samples(samples);
+	return new Sequence(w, h, format);
 }
 
 } // namespace GL
diff --git a/source/builders/sequencebuilder.h b/source/builders/sequencebuilder.h
index 4cc93037..931641fe 100644
--- a/source/builders/sequencebuilder.h
+++ b/source/builders/sequencebuilder.h
@@ -36,8 +36,7 @@ public:
 	Sequence *build(unsigned, unsigned) const;
 	Sequence *build(const View &) const;
 	Sequence *build(const Framebuffer &) const;
-
-	FrameFormat create_frame_format() const;
+	Sequence *create_sequence(unsigned, unsigned) const;
 };
 
 } // namespace GL