X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fcommands_backend.cpp;h=76469ab395be70ef4da6c8273eacf9604af91159;hb=cebf1330ef6773b7b4496dc279ec02a7ca4351bb;hp=62d952e091a557c56f8a9d3856fbba65d3277ee2;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git diff --git a/source/backends/opengl/commands_backend.cpp b/source/backends/opengl/commands_backend.cpp index 62d952e0..76469ab3 100644 --- a/source/backends/opengl/commands_backend.cpp +++ b/source/backends/opengl/commands_backend.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -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,6 +79,17 @@ 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::dispatch(unsigned count_x, unsigned count_y, unsigned count_z) +{ + 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(Framebuffer &target) { const Framebuffer *source = (pipeline_state ? pipeline_state->get_framebuffer() : 0); @@ -88,7 +103,10 @@ void OpenGLCommands::resolve_multisample(Framebuffer &target) unsigned buffers = get_gl_buffer_bits(source->get_format())&get_gl_buffer_bits(target.get_format()); if(ARB_direct_state_access) + { + target.refresh(); glBlitNamedFramebuffer(source->id, target.id, 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST); + } else { glBindFramebuffer(GL_READ_FRAMEBUFFER, source->id);