]> git.tdb.fi Git - libs/gl.git/blobdiff - source/materials/technique.cpp
Some more cleanup of includes and forward declarations
[libs/gl.git] / source / materials / technique.cpp
index ef1764112c4f3de6b98a2310ce67b84267e34e9d..21cb3a3211b24c6607c9a08ffc35d7a765322f18 100644 (file)
@@ -3,9 +3,7 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "material.h"
-#include "program.h"
 #include "programdata.h"
-#include "tag.h"
 #include "technique.h"
 #include "texture.h"
 
@@ -83,7 +81,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 +100,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)