Eliminate the polymorphic Uniform class hierarchy

[libs/gl.git] / source / materials / technique.cpp

diff --git a/source/materials/technique.cpp b/source/materials/technique.cpp
index ef1764112c4f3de6b98a2310ce67b84267e34e9d..e41f0c8ef4919612577fcf34baacced5719044fa 100644 (file)
--- a/source/materials/technique.cpp
+++ b/source/materials/technique.cpp
@@ -83,7 +83,7 @@ bool Technique::replace_uniforms(const ProgramData &shdata)
                        if(!new_shdata)
                                new_shdata = new ProgramData(*kvp.second.get_shader_data());
 
-                       new_shdata->uniform(tag, shdata.get_uniform(t));
+                       new_shdata->copy_uniform(shdata, tag);
                        replaced = true;
                }
 
@@ -102,7 +102,7 @@ bool Technique::has_shaders() const
        return false;
 }
 
-void Technique::set_debug_name(const std::string &name)
+void Technique::set_debug_name(const string &name)
 {
 #ifdef DEBUG
        for(auto &kvp: passes)