X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterials%2Frenderpass.cpp;fp=source%2Fmaterials%2Frenderpass.cpp;h=43d5803e7f1d0a799880ff99a9d8af7375cec1df;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=f144a5dd5230927f683d3c0e781d8fb0a0fe799f;hpb=b877c737bc5f759e6da25f886ad965e4a274cf2a;p=libs%2Fgl.git

diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp
index f144a5dd..43d5803e 100644
--- 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())