namespace Msp {
namespace GL {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
/*
Naming conventions:
n_* Normalized vector
(*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;
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
{
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);
}
}
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;
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;
}
add("normalmap", &StandardFeatures::normal_map);
}
+#pragma GCC diagnostic pop
+
} // namespace GL
} // namespace Msp