GPUState: Move Scissor and Viewport state to framebuffer

This way it is way clearer what each viewport state is. There is
no more save and reset. The scissor test is also saved per
framebuffer.

The only rule to remember is that the viewport state (size and
origin) is reset for both the viewport and scissor when a texture
is attached or detached from an attachment slot.

1 files changed, 10 insertions, 2 deletions

diff --git a/source/blender/gpu/opengl/gl_state.hh b/source/blender/gpu/opengl/gl_state.hh
index 8e806cb3e7a..c25e384fcd7 100644
--- a/source/blender/gpu/opengl/gl_state.hh
+++ b/source/blender/gpu/opengl/gl_state.hh
@@ -31,11 +31,17 @@
 namespace blender {
 namespace gpu {
 
+class GLFrameBuffer;
+
 /**
  * State manager keeping track of the draw state and applying it before drawing.
  * Opengl Implementation.
  **/
 class GLStateManager : public GPUStateManager {
+ public:
+  /** Anothter reference to tje active framebuffer. */
+  GLFrameBuffer *active_fb;
+
  private:
   /** Current state of the GL implementation. Avoids resetting the whole state for every change. */
   GPUState current_;
@@ -46,8 +52,7 @@ class GLStateManager : public GPUStateManager {
  public:
   GLStateManager();
 
-  void set_state(const GPUState &state) override;
-  void set_mutable_state(const GPUStateMutable &state) override;
+  void apply_state(void) override;
 
  private:
   static void set_write_mask(const eGPUWriteMask value);
@@ -62,6 +67,9 @@ class GLStateManager : public GPUStateManager {
   static void set_shadow_bias(const bool enable);
   static void set_blend(const eGPUBlend value);
 
+  void set_state(const GPUState &state);
+  void set_mutable_state(const GPUStateMutable &state);
+
   MEM_CXX_CLASS_ALLOC_FUNCS("GLStateManager")
 };