Add an abstraction for queries

[libs/gl.git] / source / core / commands.cpp

diff --git a/source/core/commands.cpp b/source/core/commands.cpp
index f2c273727c7d2b5fcd7037b77f8df51c1b1f7a1e..a0a4336ade77c6951a1fd511e884e7f6e9dd0f7c 100644 (file)
--- a/source/core/commands.cpp
+++ b/source/core/commands.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #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>
 #include <msp/gl/extensions/ext_framebuffer_blit.h>
 #include <msp/gl/extensions/ext_framebuffer_object.h>
 #include <msp/gl/extensions/msp_clear_buffer.h>
@@ -9,6 +10,7 @@
 #include "error.h"
 #include "gl.h"
 #include "pipelinestate.h"
+#include "query.h"
 
 using namespace std;
 
@@ -82,7 +84,7 @@ void Commands::draw_instanced(const Batch &batch, unsigned count)
        glDrawElementsInstanced(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr, count);
 }
 
-void Commands::resolve_multisample(Framebuffer &target, BufferBits buffers)
+void Commands::resolve_multisample(Framebuffer &target)
 {
        static Require _req(EXT_framebuffer_blit);
 
@@ -90,6 +92,7 @@ void Commands::resolve_multisample(Framebuffer &target, BufferBits buffers)
 
        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());
 
        if(ARB_direct_state_access)
                glBlitNamedFramebuffer(source->id, target.id, 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
@@ -106,5 +109,17 @@ void Commands::resolve_multisample(Framebuffer &target, BufferBits buffers)
        }
 }
 
+void Commands::begin_query(const QueryPool &pool, unsigned index)
+{
+       if(index>=pool.queries.size())
+               throw out_of_range("OpenGLCommands::begin_query");
+       glBeginQuery(pool.gl_type, pool.queries[index]);
+}
+
+void Commands::end_query(const QueryPool &pool, unsigned)
+{
+       glEndQuery(pool.gl_type);
+}
+
 } // namespace GL
 } // namespace Msp