Introduce a typedef for uniform layout hashes in Program

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

diff --git a/source/programdata.cpp b/source/programdata.cpp
index ded9f8a7bb242c38f5606b9cc1dce7bef67d4b2a..0beb9e7f6cb85d1f095def0cbe93063c64dd0a62 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,4 +1,3 @@
-#include "arb_shader_objects.h"
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -18,9 +17,7 @@ ProgramData::ProgramData():
        last_block(0),
        buffer(0),
        changes(NO_CHANGES)
-{
-       static Require _req(ARB_shader_objects);
-}
+{ }
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
@@ -33,6 +30,24 @@ ProgramData::ProgramData(const ProgramData &other):
                i->second = i->second->clone();
 }
 
+ProgramData &ProgramData::operator=(const ProgramData &other)
+{
+       for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+               delete i->second;
+       uniforms.clear();
+
+       for(UniformMap::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
+               uniforms.insert(uniforms.end(), UniformMap::value_type(i->first, i->second->clone()));
+
+       for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+               delete i->second.block;
+       blocks.clear();
+
+       changes = NO_CHANGES;
+
+       return *this;
+}
+
 ProgramData::~ProgramData()
 {
        for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
@@ -131,9 +146,7 @@ void ProgramData::uniform_matrix3(const string &name, const float *v)
 
 void ProgramData::uniform(const string &name, const Matrix &m)
 {
-       float v[16];
-       copy(m.data(), m.data()+16, v);
-       uniform_matrix4(name, v);
+       uniform_matrix4(name, m.data());
 }
 
 void ProgramData::uniform_matrix4(const string &name, const float *v)
@@ -201,9 +214,9 @@ const UniformBlock *ProgramData::get_block(const Program &prog, const Program::U
                changes = NO_CHANGES;
        }
 
-       unsigned layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
+       Program::LayoutHash layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
 
-       map<unsigned, Block>::iterator i = blocks.find(layout_hash);
+       map<Program::LayoutHash, Block>::iterator i = blocks.find(layout_hash);
        if(i==blocks.end())
        {
                i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first;