From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 12 Jan 2022 20:18:09 +0000 (+0200)
Subject: Create a function for applying framebuffer state in Renderer
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=511579d9ad9337bc3db1da1a486b3692d1c5cf1e;p=libs%2Fgl.git

Create a function for applying framebuffer state in Renderer
---

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 4beb2da7..a235a42b 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -241,11 +241,7 @@ void Renderer::set_object_lod_bias(unsigned b)
 
 void Renderer::clear(const ClearValue *values)
 {
-	const State &state = get_state();
-
-	pipeline_state.set_framebuffer(state.framebuffer);
-	pipeline_state.set_viewport(state.viewport);
-	pipeline_state.set_scissor(state.scissor);
+	apply_framebuffer();
 	commands.use_pipeline(&pipeline_state);
 	commands.clear(values);
 }
@@ -295,6 +291,16 @@ void Renderer::end_query(const QueryPool &pool, unsigned index)
 	commands.end_query(pool, index);
 }
 
+void Renderer::apply_framebuffer()
+{
+	const State &state = get_state();
+
+	pipeline_state.set_framebuffer(state.framebuffer);
+	static const Rect default_rect = Rect::max();
+	pipeline_state.set_viewport(state.viewport ? *state.viewport : default_rect);
+	pipeline_state.set_scissor(state.scissor ? *state.scissor : default_rect);
+}
+
 void Renderer::apply_state()
 {
 	const State &state = get_state();
@@ -302,9 +308,7 @@ void Renderer::apply_state()
 	if(!state.shprog)
 		throw invalid_operation("Renderer::apply_state");
 
-	pipeline_state.set_framebuffer(state.framebuffer);
-	pipeline_state.set_viewport(state.viewport);
-	pipeline_state.set_scissor(state.scissor);
+	apply_framebuffer();
 
 	bool shprog_changed = (state.shprog!=pipeline_state.get_shader_program());
 	pipeline_state.set_shader_program(state.shprog);
diff --git a/source/render/renderer.h b/source/render/renderer.h
index f08ea0b2..c176f87a 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -199,6 +199,7 @@ public:
 	void end_query(const QueryPool &, unsigned);
 
 private:
+	void apply_framebuffer();
 	void apply_state();
 };