Remove deprecated interfaces from material and lighting code

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

diff --git a/source/materials/technique.cpp b/source/materials/technique.cpp
index be51b1dabbc207ae4eb0b80bcd5bf8d81822f6a6..122eaf73d412f8f91f5c6fbf3690d6240cfea057 100644 (file)
--- a/source/materials/technique.cpp
+++ b/source/materials/technique.cpp
@@ -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;
                }
 
@@ -94,14 +92,6 @@ bool Technique::replace_uniforms(const ProgramData &shdata)
        return replaced;
 }
 
-bool Technique::has_shaders() const
-{
-       for(const auto &kvp: passes)
-               if(kvp.second.get_shader_program())
-                       return true;
-       return false;
-}
-
 void Technique::set_debug_name(const string &name)
 {
 #ifdef DEBUG