Split reflection data from Program to a separate struct

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

diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp
index f144a5dd5230927f683d3c0e781d8fb0a0fe799f..43d5803e7f1d0a799880ff99a9d8af7375cec1df 100644 (file)
--- a/source/materials/renderpass.cpp
+++ b/source/materials/renderpass.cpp
@@ -98,8 +98,8 @@ void RenderPass::set_texture(unsigned index, const Texture *tex, const Sampler *
        if(!shprog)
                throw invalid_operation("RenderPass::set_texture");
 
-       const vector<Program::UniformInfo> &uniforms = shprog->get_uniforms();
-       for(const Program::UniformInfo &u: uniforms)
+       const vector<ReflectData::UniformInfo> &uniforms = shprog->get_uniforms();
+       for(const ReflectData::UniformInfo &u: uniforms)
                if(is_image(u.type) && u.binding==static_cast<int>(index))
                        return set_texture(u.tag, tex, samp);
 
@@ -107,7 +107,7 @@ void RenderPass::set_texture(unsigned index, const Texture *tex, const Sampler *
        {
                for(Tag t: shdata->get_uniform_tags())
                {
-                       auto j = find_member(uniforms, t, &Program::UniformInfo::tag);
+                       auto j = find_member(uniforms, t, &ReflectData::UniformInfo::tag);
                        if(j==uniforms.end() || !is_image(j->type))
                                continue;
                        if(const Uniform1i *uni1i = dynamic_cast<const Uniform1i *>(shdata->find_uniform(t)))
@@ -252,7 +252,7 @@ void RenderPass::Loader::texunit(unsigned)
        string name;
        if(obj.shprog)
        {
-               for(const Program::UniformInfo &u: obj.shprog->get_uniforms())
+               for(const ReflectData::UniformInfo &u: obj.shprog->get_uniforms())
                        if(is_image(u.type) && u.binding>=0)
                        {
                                if(!name.empty())