Use an explicit material slot name in RenderPass

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

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 615da767fedefca62eebd06b68fce816aa166ad2..b69d7b062dd61af65164f94b65fc6fc41cceb90b 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -13,7 +14,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ProgramData::ProgramData():
+ProgramData::ProgramData(const Program *p):
+       tied_program(p),
        last_block(0),
        buffer(0),
        dirty(0)
@@ -21,6 +23,7 @@ ProgramData::ProgramData():
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
+       tied_program(0),
        uniform_slots(other.uniform_slots),
        uniforms(other.uniforms),
        last_block(0),
@@ -37,6 +40,8 @@ ProgramData &ProgramData::operator=(const ProgramData &other)
                delete *i;
        uniforms.clear();
 
+       tied_program = other.tied_program;
+
        uniform_slots = other.uniform_slots;
        for(vector<Uniform *>::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
                uniforms.push_back((*i)->clone());
@@ -63,8 +68,18 @@ ProgramData::~ProgramData()
 
 void ProgramData::uniform(const string &name, Uniform *uni)
 {
-       if(name[name.size()-1]==']')
-               throw invalid_argument("ProgramData::uniform");
+       try
+       {
+               if(tied_program)
+                       tied_program->get_uniform_info(name);
+               else if(name[name.size()-1]==']')
+                       throw invalid_argument("ProgramData::uniform");
+       }
+       catch(...)
+       {
+               delete uni;
+               throw;
+       }
 
        SlotMap::iterator i = uniform_slots.find(name);
        if(i!=uniform_slots.end())
@@ -255,6 +270,25 @@ void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const fl
        uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
 }
 
+void ProgramData::remove_uniform(const string &name)
+{
+       SlotMap::iterator i = uniform_slots.find(name);
+       if(i!=uniform_slots.end())
+       {
+               vector<Uniform *>::iterator j = uniforms.begin()+i->second;
+               delete *j;
+               uniforms.erase(j);
+
+               for(SlotMap::iterator k=uniform_slots.begin(); k!=uniform_slots.end(); ++k)
+                       if(k->second>i->second)
+                               --k->second;
+
+               uniform_slots.erase(i);
+
+               dirty = ALL_ONES;
+       }
+}
+
 unsigned ProgramData::compute_slot_mask(const Program::UniformBlockInfo &block) const
 {
        unsigned mask = 0;
@@ -375,7 +409,7 @@ void ProgramData::apply() const
 
                /* If any blocks stored in the buffer were updated, bind the buffer here
                to avoid state thrashing. */
-               if(buffered_blocks_updated)
+               if(buffered_blocks_updated && !ARB_direct_state_access)
                        buffer->bind();
        }