Set viewport and scissor before clear commands

Since this requires applying the pipeline state, using DSA for the clear
commands seems pointless and was removed to simplify the code.

diff --git a/source/backends/opengl/commands_backend.cpp b/source/backends/opengl/commands_backend.cpp
index fd66b99cacf35c63b2f0eb8394828d939aabb76a..e9fa8b7c02d011f1ebd4d29f006ef29f8b0f314f 100644 (file)
--- a/source/backends/opengl/commands_backend.cpp
+++ b/source/backends/opengl/commands_backend.cpp
@@ -35,36 +35,19 @@ void OpenGLCommands::clear(const ClearValue *values)
        if(!target)
                throw invalid_operation("OpenGLCommands::clear");
 
-       if(!ARB_direct_state_access)
-       {
-               static Require _req(MSP_clear_buffer);
-               pipeline_state->apply();
-       }
+       static Require _req(MSP_clear_buffer);
+
+       pipeline_state->apply();
 
        unsigned i = 0;
        for(FrameAttachment a: target->get_format())
        {
                if(get_attach_point(a)==get_attach_point(DEPTH_ATTACHMENT))
-               {
-                       if(ARB_direct_state_access)
-                               glClearNamedFramebufferfv(target->id, GL_DEPTH, 0, &values->depth_stencil.depth);
-                       else
-                               glClearBufferfv(GL_DEPTH, 0, &values->depth_stencil.depth);
-               }
+                       glClearBufferfv(GL_DEPTH, 0, &values->depth_stencil.depth);
                else if(get_attach_point(a)==get_attach_point(STENCIL_ATTACHMENT))
-               {
-                       if(ARB_direct_state_access)
-                               glClearNamedFramebufferiv(target->id, GL_STENCIL, 0, &values->depth_stencil.stencil);
-                       else
-                               glClearBufferiv(GL_STENCIL, 0, &values->depth_stencil.stencil);
-               }
+                       glClearBufferiv(GL_STENCIL, 0, &values->depth_stencil.stencil);
                else
-               {
-                       if(ARB_direct_state_access)
-                               glClearNamedFramebufferfv(target->id, GL_COLOR, i++, &values->color.r);
-                       else
-                               glClearBufferfv(GL_COLOR, i++, &values->color.r);
-               }
+                       glClearBufferfv(GL_COLOR, i++, &values->color.r);
                ++values;
        }
 }

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index b142da75448652c3135a9aa3b30e796aa374f8ac..a515071d29f9d4cdb8ab5f74236369deeba5b3f9 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -245,6 +245,8 @@ void Renderer::render(const Renderable &renderable, Tag tag)
 void Renderer::clear(const ClearValue *values)
 {
        pipeline_state.set_framebuffer(state->framebuffer);
+       pipeline_state.set_viewport(state->viewport);
+       pipeline_state.set_scissor(state->scissor);
        commands.use_pipeline(&pipeline_state);
        commands.clear(values);
 }