Treat clear() with null parameter as invalidate

[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 e9fa8b7c02d011f1ebd4d29f006ef29f8b0f314f..1ec19c13d63b7e908a2f90ddbcdbada8bcfd4363 100644 (file)
--- a/source/backends/opengl/commands_backend.cpp
+++ b/source/backends/opengl/commands_backend.cpp
@@ -18,9 +18,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-OpenGLCommands::OpenGLCommands():
-       pipeline_state(0)
-{ }
+void OpenGLCommands::submit_frame()
+{
+       glFlush();
+}
 
 void OpenGLCommands::use_pipeline(const PipelineState *ps)
 {
@@ -31,10 +32,13 @@ void OpenGLCommands::use_pipeline(const PipelineState *ps)
 
 void OpenGLCommands::clear(const ClearValue *values)
 {
-       const Framebuffer *target = pipeline_state->get_framebuffer();
+       const Framebuffer *target = (pipeline_state ? pipeline_state->get_framebuffer() : 0);
        if(!target)
                throw invalid_operation("OpenGLCommands::clear");
 
+       if(!values)
+               return;
+
        static Require _req(MSP_clear_buffer);
 
        pipeline_state->apply();
@@ -54,6 +58,9 @@ void OpenGLCommands::clear(const ClearValue *values)
 
 void OpenGLCommands::draw(const Batch &batch)
 {
+       if(!pipeline_state)
+               throw invalid_operation("OpenGLCommands::draw");
+
        pipeline_state->apply();
        void *data_ptr = reinterpret_cast<void *>(batch.get_offset());
        glDrawElements(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr);
@@ -61,6 +68,9 @@ void OpenGLCommands::draw(const Batch &batch)
 
 void OpenGLCommands::draw_instanced(const Batch &batch, unsigned count)
 {
+       if(!pipeline_state)
+               throw invalid_operation("OpenGLCommands::draw_instanced");
+
        static Require req(ARB_draw_instanced);
 
        pipeline_state->apply();
@@ -70,9 +80,11 @@ void OpenGLCommands::draw_instanced(const Batch &batch, unsigned count)
 
 void OpenGLCommands::resolve_multisample(Framebuffer &target)
 {
-       static Require _req(EXT_framebuffer_blit);
+       const Framebuffer *source = (pipeline_state ? pipeline_state->get_framebuffer() : 0);
+       if(!source)
+               throw invalid_operation("OpenGLCommands::draw");
 
-       const Framebuffer *source = pipeline_state->get_framebuffer();
+       static Require _req(EXT_framebuffer_blit);
 
        unsigned width = min(source->get_width(), target.get_width());
        unsigned height = min(source->get_height(), target.get_height());