X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=53af9793efa484d125573b2c1440dcab9bb007f9;hb=cf6eec94b7d02885c00c6b8d79380aae7d7669f5;hp=e4739da0b738a5fd727bfe53410aaec0a40238de;hpb=5b3aa68610238de4e6f13c4bf9ec1745751e820c;p=libs%2Fgl.git

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index e4739da0..53af9793 100644
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -15,6 +15,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 /*
 Naming conventions:
   n_*        Normalized vector
@@ -893,7 +896,7 @@ void ProgramBuilder::ShaderVariable::resolve_space(const string &space)
 			(*i)->resolve_space(space);
 }
 
-void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &features, unsigned size_hint)
+void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &feat, unsigned size_hint)
 {
 	if(array_size)
 		return;
@@ -910,9 +913,9 @@ void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &featu
 	if(variable && variable->scope==UNIFORM)
 	{
 		if(array_subscript=="MAX_LIGHTS")
-			array_size = features.max_lights;
+			array_size = feat.max_lights;
 		else if(array_subscript=="MAX_CLIP_PLANES")
-			array_size = features.max_clip_planes;
+			array_size = feat.max_clip_planes;
 		else if(isnumrc(array_subscript))
 			array_size = lexical_cast<unsigned>(array_subscript);
 		else
@@ -936,7 +939,7 @@ void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &featu
 	{
 		for(list<ShaderVariable *>::const_iterator i=referenced_vars.begin(); i!=referenced_vars.end(); ++i)
 			if(!(*i)->array_subscript.empty() && !(*i)->array_size)
-				(*i)->resolve_array(features, array_size);
+				(*i)->resolve_array(feat, array_size);
 	}
 }
 
@@ -1092,19 +1095,19 @@ string ProgramBuilder::ShaderVariable::create_declaration(char iface, bool loop)
 		return format("%s %s%s", variable->type, resolved_name, array);
 }
 
-string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, unsigned enabled_scopes, const char *loop) const
+string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, unsigned scopes, const char *loop) const
 {
 	string replacement = resolved_name;
 	InterfaceFlags iface = NO_INTERFACE;
 	if(variable)
 	{
 		iface = get_interface_flags(from_scope);
-		VariableScope prev_scope = previous_scope(from_scope, enabled_scopes);
+		VariableScope prev_scope = previous_scope(from_scope, scopes);
 		if((iface&INPUT) && interfaces[prev_scope])
 			replacement = format("%c_%s", interfaces[prev_scope], replacement);
 		else if(inlined)
 		{
-			replacement = create_expression(enabled_scopes, loop);
+			replacement = create_expression(scopes, loop);
 			if(inline_parens)
 				replacement = "("+replacement+")";
 			return replacement;
@@ -1123,12 +1126,12 @@ string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_sco
 	return replacement;
 }
 
-string ProgramBuilder::ShaderVariable::create_expression(unsigned enabled_scopes, const char *loop) const
+string ProgramBuilder::ShaderVariable::create_expression(unsigned scopes, const char *loop) const
 {
 	map<string, string> replace_map;
 	for(list<ShaderVariable *>::const_iterator i=referenced_vars.begin(); i!=referenced_vars.end(); ++i)
 	{
-		string replacement = (*i)->create_replacement(variable->scope, enabled_scopes, loop);
+		string replacement = (*i)->create_replacement(variable->scope, scopes, loop);
 		if(replacement!=(*i)->name)
 			replace_map[(*i)->name] = replacement;
 	}
@@ -1162,5 +1165,7 @@ ProgramBuilder::StandardFeatures::Loader::Loader(StandardFeatures &f):
 	add("normalmap", &StandardFeatures::normal_map);
 }
 
+#pragma GCC diagnostic pop
+
 } // namespace GL
 } // namespace Msp