Rework multisample resolve to use resolve attachments

[libs/gl.git] / source / backends / opengl / commands_backend.cpp

diff --git a/source/backends/opengl/commands_backend.cpp b/source/backends/opengl/commands_backend.cpp
index 62d952e091a557c56f8a9d3856fbba65d3277ee2..0a4416c69814bea21aa00fda272c09642743e55f 100644 (file)
--- a/source/backends/opengl/commands_backend.cpp
+++ b/source/backends/opengl/commands_backend.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <msp/gl/extensions/arb_compute_shader.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_draw_instanced.h>
 #include <msp/gl/extensions/arb_occlusion_query.h>
@@ -36,6 +37,9 @@ void OpenGLCommands::clear(const ClearValue *values)
        if(!target)
                throw invalid_operation("OpenGLCommands::clear");
 
+       if(!values)
+               return;
+
        static Require _req(MSP_clear_buffer);
 
        pipeline_state->apply();
@@ -75,30 +79,43 @@ void OpenGLCommands::draw_instanced(const Batch &batch, unsigned count)
        glDrawElementsInstanced(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr, count);
 }
 
-void OpenGLCommands::resolve_multisample(Framebuffer &target)
+void OpenGLCommands::dispatch(unsigned count_x, unsigned count_y, unsigned count_z)
 {
-       const Framebuffer *source = (pipeline_state ? pipeline_state->get_framebuffer() : 0);
-       if(!source)
-               throw invalid_operation("OpenGLCommands::draw");
+       if(!pipeline_state)
+               throw invalid_operation("OpenGLCommands::dispatch_compute");
+
+       static Require req(ARB_compute_shader);
+
+       pipeline_state->apply();
+       glDispatchCompute(count_x, count_y, count_z);
+}
+
+void OpenGLCommands::resolve_multisample()
+{
+       const Framebuffer *framebuffer = (pipeline_state ? pipeline_state->get_framebuffer() : 0);
+       if(!framebuffer)
+               throw invalid_operation("OpenGLCommands::resolve_multisample");
 
        static Require _req(EXT_framebuffer_blit);
 
-       unsigned width = min(source->get_width(), target.get_width());
-       unsigned height = min(source->get_height(), target.get_height());
-       unsigned buffers = get_gl_buffer_bits(source->get_format())&get_gl_buffer_bits(target.get_format());
+       unsigned width = framebuffer->get_width();
+       unsigned height = framebuffer->get_height();
+       unsigned buffers = get_gl_buffer_bits(framebuffer->get_format());
 
        if(ARB_direct_state_access)
-               glBlitNamedFramebuffer(source->id, target.id, 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
+       {
+               framebuffer->refresh();
+               glBlitNamedFramebuffer(framebuffer->id, framebuffer->resolve_id, 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
+       }
        else
        {
-               glBindFramebuffer(GL_READ_FRAMEBUFFER, source->id);
-               glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target.id);
+               glBindFramebuffer(GL_FRAMEBUFFER, framebuffer->id);
 
-               target.refresh();
+               framebuffer->refresh();
 
+               glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer->resolve_id);
                glBlitFramebuffer(0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
-
-               glBindFramebuffer(GL_FRAMEBUFFER, source->id);
+               glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer->id);
        }
 }