Rewrite state management

[libs/gl.git] / source / render / programdata.cpp

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index f3c6108c767284a9e158ee88df7fdd9a5986873d..79b559019d116b196502267222e5c37e6985642d 100644 (file)
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -7,6 +7,7 @@
 #include "color.h"
 #include "error.h"
 #include "matrix.h"
+#include "pipelinestate.h"
 #include "program.h"
 #include "programdata.h"
 #include "uniform.h"
@@ -565,7 +566,14 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program
                if(info.bind_point>=0)
                {
                        if(!buffer)
-                               buffer = new Buffer(UNIFORM_BUFFER);
+                       {
+                               buffer = new Buffer();
+
+#ifdef DEBUG
+                               if(!debug_name.empty())
+                                       buffer->set_debug_name(debug_name);
+#endif
+                       }
 
                        BufferBackedUniformBlock *bb_block = new BufferBackedUniformBlock(info.data_size);
                        block.block = bb_block;
@@ -589,15 +597,10 @@ void ProgramData::update_block(SharedBlock &block, const Program::UniformBlockIn
        }
 }
 
-void ProgramData::apply() const
+vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(const Program &prog) const
 {
-       const Program *prog = Program::current();
-       if(!prog)
-               throw invalid_operation("ProgramData::apply");
-
        BufferBackedUniformBlock *old_last_block = last_buffer_block;
-       vector<ProgramBlock>::iterator prog_begin = get_program(*prog);
-       Program::LayoutHash prog_hash = prog->get_uniform_layout_hash();
+       vector<ProgramBlock>::iterator prog_begin = get_program(prog);
 
        Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
        Mask affected = (dirty&prog_begin->masks.used) | force_dirty;
@@ -616,7 +619,7 @@ void ProgramData::apply() const
                        dirty = 0;
                }
 
-               const vector<Program::UniformBlockInfo> &block_infos = prog->get_uniform_blocks();
+               const vector<Program::UniformBlockInfo> &block_infos = prog.get_uniform_blocks();
 
                if(prog_begin->masks.dirty==ALL_ONES)
                {
@@ -650,11 +653,6 @@ void ProgramData::apply() const
 
                prog_begin->masks.dirty = 0;
 
-               /* If any blocks stored in the buffer were updated, bind the buffer here
-               to avoid state thrashing. */
-               if(buffered_blocks_updated && !ARB_direct_state_access)
-                       buffer->bind();
-
                if(last_buffer_block!=old_last_block)
                {
                        unsigned required_size = last_buffer_block->get_required_buffer_size();
@@ -663,8 +661,13 @@ void ProgramData::apply() const
                                if(buffer->get_size()>0)
                                {
                                        delete buffer;
-                                       buffer = new Buffer(UNIFORM_BUFFER);
+                                       buffer = new Buffer();
                                        last_buffer_block->change_buffer(buffer);
+
+#ifdef DEBUG
+                                       if(!debug_name.empty())
+                                               buffer->set_debug_name(debug_name);
+#endif
                                }
 
                                buffer->storage(required_size);
@@ -672,9 +675,36 @@ void ProgramData::apply() const
                }
        }
 
-       for(vector<ProgramBlock>::iterator i=prog_begin+1; (i!=programs.end() && i->prog_hash==prog_hash); ++i)
+       return prog_begin;
+}
+
+void ProgramData::apply(const Program &prog, PipelineState &state) const
+{
+       vector<ProgramBlock>::const_iterator prog_begin = prepare_program(prog);
+       Program::LayoutHash prog_hash = prog_begin->prog_hash;
+       for(vector<ProgramBlock>::const_iterator i=prog_begin+1; (i!=programs.end() && i->prog_hash==prog_hash); ++i)
                if(i->block)
-                       i->block->apply(i->bind_point);
+               {
+                       if(i->bind_point<0)
+                               state.set_uniforms(static_cast<const DefaultUniformBlock *>(i->block));
+                       else
+                       {
+                               const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(i->block);
+                               block->refresh();
+                               state.set_uniform_block(i->bind_point, block);
+                       }
+               }
+}
+
+void ProgramData::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+       debug_name = name;
+       if(buffer)
+               buffer->set_debug_name(name);
+#else
+       (void)name;
+#endif
 }