{ FRAGMENT, "n_zzz_light_dir[i]", "vec3", "normalize(zzz_light_dir[i])", 0 },
{ FRAGMENT, "n_tbn_normal", "vec3", "normal_sample*2.0-1.0", "n" },
{ FRAGMENT, "n_eye_normal", "vec3", "normalize(eye_normal)", "!n" },
- { FRAGMENT, "normal_sample", "vec3", "texture2D(normalmap, texture_coord).xyz", 0 },
- { FRAGMENT, "diffuse_sample", "vec4", "texture2D(diffusemap, texture_coord)", 0 },
+ { FRAGMENT, "normal_sample", "vec3", "texture2D(normal_map, texture_coord).xyz", 0 },
+ { FRAGMENT, "diffuse_sample", "vec4", "texture2D(diffuse_map, texture_coord)", 0 },
{ VERTEX, "gl_Position", "vec4", "projection_matrix*eye_vertex", 0 },
{ VERTEX, "gl_ClipDistance[i]", "float", "dot(eye_vertex, clip_planes[i].equation)", "c" },
{ ATTRIBUTE, "tangent", "vec3", 0, 0 },
{ ATTRIBUTE, "binormal", "vec3", 0, 0 },
- { UNIFORM, "diffusemap", "sampler2D", 0, 0 },
+ { UNIFORM, "diffuse_map", "sampler2D", 0, 0 },
{ UNIFORM, "shadow", "sampler2DShadow", 0, 0 },
{ UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 },
- { UNIFORM, "normalmap", "sampler2D", 0, 0 },
+ { UNIFORM, "normal_map", "sampler2D", 0, 0 },
{ UNIFORM, "environment", "samplerCube", 0, 0 },
{ UNIFORM, "EnvMap::env_eye_matrix", "mat3", 0, 0 },
{ UNIFORM, "Material::reflectivity", "float", 0, 0 },
{ NO_SCOPE, 0, 0, 0, 0 }
};
-const char ProgramBuilder::interfaces[] = { 0, 0, 0, 0, 'v', 0 };
+const char ProgramBuilder::interfaces[] = { 0, 0, 0, 0, 0, 'v', 'g', 0 };
ProgramBuilder::ProgramBuilder(const StandardFeatures &f):
features(f),
feature_flags(features.create_flags()),
+ enabled_scopes((1<<N_SCOPES)-1),
optimize(true)
{
if(!features.custom.empty())
var.scope = VERTEX;
else if(!strcmp(word, "fragment"))
var.scope = FRAGMENT;
+ else if(!strcmp(word, "function"))
+ var.scope = FUNCTION;
else
throw invalid_variable_definition(word);
}
var.name = word;
start = features.custom.find_first_not_of(whitespace, word_end+1);
- if(start>=decl_end)
+ if(start>=decl_end || (var.scope==FUNCTION && features.custom[start]=='('))
break;
}
if(equals!=string::npos)
{
+ if(var.scope==FUNCTION)
+ throw invalid_variable_definition("function with expression");
start = features.custom.find_first_not_of(whitespace, equals+1);
if(start>=semicolon)
throw invalid_variable_definition("no expression");
features.custom[semicolon] = 0;
var.expression = &features.custom[start];
}
+ else if(var.scope==FUNCTION)
+ {
+ string::size_type left_paren = features.custom.find('(', start);
+ string::size_type right_paren = features.custom.find(')', start);
+ if(left_paren>semicolon || right_paren>semicolon)
+ throw invalid_variable_definition("no argument list");
+ features.custom[right_paren] = 0;
+ var.expression = &features.custom[left_paren+1];
+ }
else
var.expression = 0;
}
}
+ if(!features.geometry)
+ enabled_scopes &= ~(1<<GEOMETRY);
+
if(!features.legacy)
{
aliases["texture1D"] = "texture";
prog.bind_attribute(NORMAL3, "normal");
else if(features.material)
prog.bind_attribute(COLOR4_FLOAT, "color");
- if(features.texture || features.normalmap)
+ if(features.texture || features.normal_map)
prog.bind_attribute(TEXCOORD4, "texcoord");
}
- if(features.normalmap)
+ if(features.normal_map)
{
prog.bind_attribute(get_component_type(TANGENT3), "tangent");
prog.bind_attribute(get_component_type(BINORMAL3), "binormal");
set<const VariableDefinition *> declared_types;
set<string> uniform_blocks;
for(list<ShaderVariable *>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
- if((*i)->variable->scope==UNIFORM && (*i)->is_referenced_from(scope) && !(*i)->inlined)
+ {
+ if(!(*i)->is_referenced_from(scope))
+ continue;
+
+ if((*i)->variable->scope==FUNCTION)
+ source += format("%s;\n", (*i)->create_declaration());
+ else if((*i)->variable->scope==UNIFORM && !(*i)->inlined)
{
if((*i)->type && !declared_types.count((*i)->type))
{
else
source += format("uniform %s;\n", (*i)->create_declaration());
}
+ }
for(set<string>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
{
if(iface&INPUT)
{
const char *qualifier = (features.legacy ? scope==VERTEX ? "attribute" : "varying" : "in");
- source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope-1]));
+ source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[previous_scope(scope, enabled_scopes)]));
}
if(iface&OUTPUT)
return result;
}
+ProgramBuilder::VariableScope ProgramBuilder::previous_scope(VariableScope scope, unsigned enabled_scopes)
+{
+ while(scope!=NO_SCOPE)
+ {
+ scope = static_cast<VariableScope>(scope-1);
+ if(enabled_scopes&(1<<scope))
+ break;
+ }
+
+ return scope;
+}
+
string ProgramBuilder::create_expression(const ShaderVariable &var, const char *loop) const
{
- string expr = var.create_expression(loop);
+ string expr = var.create_expression(enabled_scopes, loop);
return replace_identifiers(expr.c_str(), aliases, true);
}
skylight(false),
fog(false),
specular(false),
- normalmap(false),
+ normal_map(false),
shadow(false),
reflection(false),
clipping(false),
- max_clip_planes(1)
+ max_clip_planes(1),
+ geometry(false)
{
if(get_gl_api()==OPENGL_ES2)
- legacy = !(get_glsl_version()>=Version(3, 0));
+ legacy = get_glsl_version()<Version(3, 0);
else
- legacy = !(get_glsl_version()>=Version(1, 30));
+ legacy = get_glsl_version()<Version(1, 30);
}
string ProgramBuilder::StandardFeatures::create_flags() const
flags += 'y';
if(specular)
flags += 'p';
- if(normalmap)
+ if(normal_map)
flags += 'n';
}
if(fog)
(*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);
}
}
void ProgramBuilder::ShaderVariable::check_inline(bool allow_legacy, bool trivial_only)
{
- if(variable->expression)
+ if(variable->expression && variable->scope>=UNIFORM)
{
if(array_sum && array_size>1)
return;
{
/* Uniforms are available to all stages and are not passed through
interfaces */
- if(variable->scope==UNIFORM)
+ if(variable->scope<=UNIFORM)
return NO_INTERFACE;
int flags = NO_INTERFACE;
string ProgramBuilder::ShaderVariable::create_declaration(char iface, bool loop) const
{
+ if(variable->scope==FUNCTION)
+ return format("%s %s(%s)", variable->type, resolved_name, variable->expression);
+
if(variable->scope==UNIFORM && !array_subscript.empty())
{
const char *bracket = strrchr(variable->type, '[');
return format("%s %s%s", variable->type, resolved_name, array);
}
-string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, 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);
- if((iface&INPUT) && interfaces[from_scope-1])
- replacement = format("%c_%s", interfaces[from_scope-1], replacement);
+ 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(loop);
+ replacement = create_expression(scopes, loop);
if(inline_parens)
replacement = "("+replacement+")";
return replacement;
return replacement;
}
-string ProgramBuilder::ShaderVariable::create_expression(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, loop);
+ string replacement = (*i)->create_replacement(variable->scope, scopes, loop);
if(replacement!=(*i)->name)
replace_map[(*i)->name] = replacement;
}
add("clipping", &StandardFeatures::clipping);
add("custom", &StandardFeatures::custom);
add("fog", &StandardFeatures::fog);
+ add("geometry", &StandardFeatures::geometry);
add("lighting", &StandardFeatures::lighting);
add("material", &StandardFeatures::material);
add("max_clip_planes", &StandardFeatures::max_clip_planes);
add("max_lights", &StandardFeatures::max_lights);
- add("normalmap", &StandardFeatures::normalmap);
+ add("normal_map", &StandardFeatures::normal_map);
add("reflection", &StandardFeatures::reflection);
add("shadow", &StandardFeatures::shadow);
add("skylight", &StandardFeatures::skylight);
add("specular", &StandardFeatures::specular);
add("texture", &StandardFeatures::texture);
+
+ // Deprecated
+ add("normalmap", &StandardFeatures::normal_map);
}
} // namespace GL
projects / libs / gl.git / blobdiff