From 4cd245dafe6a7ee5c93edca5aee2d146f1155309 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 18 Nov 2021 12:48:08 +0200 Subject: [PATCH] Add checks for invalid state in OpenGLCommands --- source/backends/opengl/commands_backend.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/source/backends/opengl/commands_backend.cpp b/source/backends/opengl/commands_backend.cpp index adecd5c8..97b4f12c 100644 --- a/source/backends/opengl/commands_backend.cpp +++ b/source/backends/opengl/commands_backend.cpp @@ -27,7 +27,7 @@ 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"); @@ -50,6 +50,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(batch.get_offset()); glDrawElements(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr); @@ -57,6 +60,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(); @@ -66,9 +72,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()); -- 2.43.0