X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=247c249b380901623e1dfc02ac573966e445a89f;hp=5379abf2cc289162fb843341c7315759d039431f;hb=4a1e2b6a68095e6bb7c212be57abb5a1509739b9;hpb=25865f3fe46831f73429cc0b8b95a4271520d10e diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 5379abf2..247c249b 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -106,8 +106,8 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { 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" }, @@ -133,10 +133,10 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { 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 }, @@ -162,11 +162,12 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { 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<=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; @@ -246,6 +260,9 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f): } } + if(!features.geometry) + enabled_scopes &= ~(1< &variables, Va set declared_types; set uniform_blocks; for(list::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)) { @@ -428,6 +451,7 @@ string ProgramBuilder::create_source(const list &variables, Va else source += format("uniform %s;\n", (*i)->create_declaration()); } + } for(set::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) { @@ -449,7 +473,7 @@ string ProgramBuilder::create_source(const list &variables, Va 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) @@ -723,9 +747,21 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map(scope-1); + if(enabled_scopes&(1<=Version(3, 0)); + legacy = get_glsl_version()=Version(1, 30)); + legacy = get_glsl_version()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; @@ -873,9 +910,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(array_subscript); else @@ -899,7 +936,7 @@ void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &featu { for(list::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); } } @@ -921,7 +958,7 @@ void ProgramBuilder::ShaderVariable::update_reference(ShaderVariable &from, Shad 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; @@ -995,7 +1032,7 @@ ProgramBuilder::InterfaceFlags ProgramBuilder::ShaderVariable::get_interface_fla { /* 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; @@ -1035,6 +1072,9 @@ string ProgramBuilder::ShaderVariable::create_type_declaration() const 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, '['); @@ -1052,18 +1092,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, 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; @@ -1082,12 +1123,12 @@ string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_sco return replacement; } -string ProgramBuilder::ShaderVariable::create_expression(const char *loop) const +string ProgramBuilder::ShaderVariable::create_expression(unsigned scopes, const char *loop) const { map replace_map; for(list::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; } @@ -1105,16 +1146,20 @@ ProgramBuilder::StandardFeatures::Loader::Loader(StandardFeatures &f): 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