X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=247c249b380901623e1dfc02ac573966e445a89f;hp=7df08d0877bedd5942e6fcf6addb0e400534c91e;hb=d5c26741ed3952dd54c8a7f43ad42ba79bf2d977;hpb=0b3f7414a55b36c83878e6fdb0c6be0601d66ff0 diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 7df08d08..247c249b 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include "extension.h" @@ -43,10 +44,14 @@ Naming conventions: anything that might need them. */ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { - { FRAGMENT, "gl_FragColor", "vec4", "frag_color", "g" }, - { FRAGMENT, "frag_color", "vec4", "basic_color", "!e!l" }, - { FRAGMENT, "frag_color", "vec4", "vec4(rgb_surface, surface_alpha)", "!el" }, - { FRAGMENT, "frag_color", "vec4", "vec4(rgb_surface+rgb_reflection, surface_alpha)", "e" }, + { FRAGMENT, "gl_FragColor", "vec4", "frag_color", 0 }, + { FRAGMENT, "frag_color", "vec4", "incoming_color", "!f" }, + { FRAGMENT, "frag_color", "vec4", "vec4(mix(fog_color.rgb, incoming_color.rgb, fog_value), incoming_color.a)", "f" }, + { FRAGMENT, "fog_value", "float", "exp(-fog_coord*fog_density)", 0 }, + + { FRAGMENT, "incoming_color", "vec4", "basic_color", "!e!l" }, + { FRAGMENT, "incoming_color", "vec4", "vec4(rgb_surface, surface_alpha)", "!el" }, + { FRAGMENT, "incoming_color", "vec4", "vec4(rgb_surface+rgb_reflection, surface_alpha)", "e" }, { FRAGMENT, "rgb_reflection", "vec3", "reflect_sample.rgb*reflectivity", 0 }, { FRAGMENT, "reflect_sample", "vec4", "textureCube(environment, env_reflect_dir)", 0 }, @@ -57,21 +62,22 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { FRAGMENT, "rgb_surface", "vec3", "rgb_lit_surface", "l" }, { FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb", "!s" }, { FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb*l_shadow", "s" }, - { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m" }, + { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m!t" }, + { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse*diffuse_sample.rgb", "!mt" }, { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse", "m!p" }, { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse+rgb_surface_specular", "mp" }, { FRAGMENT, "surface_alpha", "float", "basic_color.a", "!m" }, { FRAGMENT, "surface_alpha", "float", "basic_color.a", "m!l" }, { FRAGMENT, "surface_alpha", "float", "material.diffuse.a", "ml!t" }, - { FRAGMENT, "surface_alpha", "float", "material.diffuse.a*tex_sample.a", "mlt" }, + { FRAGMENT, "surface_alpha", "float", "material.diffuse.a*diffuse_sample.a", "mlt" }, { FRAGMENT, "basic_color", "vec4", "vec4(1.0)", "!m!t" }, - { FRAGMENT, "basic_color", "vec4", "tex_sample", "!mt" }, + { FRAGMENT, "basic_color", "vec4", "diffuse_sample", "!mt" }, { FRAGMENT, "basic_color", "vec4", "color", "m!t" }, - { FRAGMENT, "basic_color", "vec4", "color*tex_sample", "mt" }, + { FRAGMENT, "basic_color", "vec4", "color*diffuse_sample", "mt" }, { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb", "!t" }, - { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb*tex_sample.rgb", "t" }, + { FRAGMENT, "rgb_surface_ambient", "vec3", "rgb_illumination_ambient*material.ambient.rgb*diffuse_sample.rgb", "t" }, { FRAGMENT, "rgb_illumination_ambient", "vec3", "ambient_color.rgb", "!y" }, { FRAGMENT, "rgb_illumination_ambient", "vec3", "ambient_color.rgb+l_skylight*sky_color.rgb", "y" }, { FRAGMENT, "l_skylight", "float", "dot(n_zzz_normal, zzz_sky_dir)*0.5+0.5", 0 }, @@ -86,26 +92,27 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { FRAGMENT, "l_specular[i]", "float", "pow(max(dot(n_zzz_half_vec[i], n_zzz_normal), 0.0), material.shininess)", 0 }, { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb", "!t" }, - { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb*tex_sample.rgb", "t" }, + { FRAGMENT, "rgb_surface_diffuse", "vec3", "rgb_illumination_diffuse*material.diffuse.rgb*diffuse_sample.rgb", "t" }, { FRAGMENT, "rgb_illumination_diffuse", "vec3", "rgb_light_diffuse", "!s" }, { FRAGMENT, "rgb_illumination_diffuse", "vec3", "rgb_light_diffuse*l_shadow", "s" }, { FRAGMENT, "rgb_light_diffuse[i]", "vec3", "l_diffuse[i]*light_sources[i].diffuse.rgb", 0 }, { FRAGMENT, "l_diffuse[i]", "float", "max(dot(n_zzz_normal, n_zzz_light_dir[i]), 0.0)", 0 }, { FRAGMENT, "l_shadow", "float", "mix(1.0, shadow_sample, shadow_darkness)", 0 }, - { FRAGMENT, "shadow_sample", "float", "shadow2D(shadow, shd_vertex).r", 0 }, + { FRAGMENT, "shadow_sample", "float", "shadow2D(shadow, shd_vertex)", 0 }, { FRAGMENT, "zzz_reflect_dir", "vec3", "reflect(zzz_incident_dir, n_zzz_normal)", 0 }, { FRAGMENT, "n_zzz_half_vec[i]", "vec3", "normalize(zzz_light_dir[i]-zzz_incident_dir)", 0 }, { 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, "tex_sample", "vec4", "texture2D(texture, 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, "shd_vertex", "vec3", "vec3(dot(eye_vertex, gl_EyePlaneS[shadow_unit]), dot(eye_vertex, gl_EyePlaneT[shadow_unit]), dot(eye_vertex, gl_EyePlaneR[shadow_unit]))", "g" }, - { VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", "!g" }, + { VERTEX, "gl_ClipDistance[i]", "float", "dot(eye_vertex, clip_planes[i].equation)", "c" }, + { VERTEX, "fog_coord", "float", "-eye_vertex.z", 0 }, + { VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", 0 }, { VERTEX, "tbn_sky_dir", "vec3", "eye_sky_dir*eye_tbn_matrix", "n" }, { VERTEX, "tbn_light_dir[i]", "vec3", "eye_light_dir[i]*eye_tbn_matrix", 0 }, { VERTEX, "eye_light_dir[i]", "vec3", "normalize(eye_light_position[i].xyz-eye_vertex.xyz*eye_light_position[i].w)", 0 }, @@ -126,37 +133,41 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { ATTRIBUTE, "tangent", "vec3", 0, 0 }, { ATTRIBUTE, "binormal", "vec3", 0, 0 }, - { UNIFORM, "shadow_unit", "int", 0, 0 }, - { UNIFORM, "texture", "sampler2D", 0, 0 }, + { UNIFORM, "diffuse_map", "sampler2D", 0, 0 }, { UNIFORM, "shadow", "sampler2DShadow", 0, 0 }, - { UNIFORM, "shadow_darkness", "float", 0, 0 }, - { UNIFORM, "normalmap", "sampler2D", 0, 0 }, + { UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 }, + { UNIFORM, "normal_map", "sampler2D", 0, 0 }, { UNIFORM, "environment", "samplerCube", 0, 0 }, - { UNIFORM, "env_eye_matrix", "mat3", 0, 0 }, - { UNIFORM, "reflectivity", "float", 0, 0 }, + { UNIFORM, "EnvMap::env_eye_matrix", "mat3", 0, 0 }, + { UNIFORM, "Material::reflectivity", "float", 0, 0 }, { UNIFORM, "eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 }, { UNIFORM, "eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 }, - { UNIFORM, "projection_matrix", "mat4", "gl_ProjectionMatrix", 0 }, - { UNIFORM, "shd_eye_matrix", "mat4", 0, 0 }, - { UNIFORM, "light_sources", "LightSourceParameters[MAX_LIGHTS]", "gl_LightSource[i]", 0 }, - { UNIFORM, "ambient_color", "vec4", 0, 0 }, - { UNIFORM, "sky_color", "vec4", 0, 0 }, - { UNIFORM, "eye_sky_dir", "vec3", 0, 0 }, - { UNIFORM, "horizon_limit", "float", 0, 0 }, - { UNIFORM, "material", "MaterialParameters", "gl_FrontMaterial", 0 }, + { UNIFORM, "Transform::projection_matrix", "mat4", "gl_ProjectionMatrix", 0 }, + { UNIFORM, "ShadowMap::shd_eye_matrix", "mat4", 0, 0 }, + { UNIFORM, "Lighting::light_sources", "LightSourceParameters[MAX_LIGHTS]", "gl_LightSource[i]", 0 }, + { UNIFORM, "Lighting::ambient_color", "vec4", "gl_LightModel.ambient", 0 }, + { UNIFORM, "Lighting::sky_color", "vec4", 0, 0 }, + { UNIFORM, "Lighting::eye_sky_dir", "vec3", 0, 0 }, + { UNIFORM, "Lighting::horizon_limit", "float", 0, 0 }, + { UNIFORM, "Lighting::fog_color", "vec4", "gl_Fog.color", 0 }, + { UNIFORM, "Lighting::fog_density", "float", "gl_Fog.density", 0 }, + { UNIFORM, "Material::material", "MaterialParameters", "gl_FrontMaterial", 0 }, + { UNIFORM, "Clipping::clip_planes", "ClipPlane[MAX_CLIP_PLANES]", 0, 0 }, { TYPE, "LightSourceParameters", "struct { vec4 position; vec4 diffuse; vec4 specular; }", "gl_LightSourceParameters", 0 }, { TYPE, "MaterialParameters", "struct { vec4 ambient; vec4 diffuse; vec4 specular; float shininess; }", "gl_MaterialParameters", 0 }, + { TYPE, "ClipPlane", "struct { vec4 equation; }", 0, 0 }, // Terminator entry { 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; @@ -235,6 +259,20 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f): start = semicolon+1; } } + + if(!features.geometry) + enabled_scopes &= ~(1< variables; list resolved_vars; + if(features.clipping) + variables.push_back(ShaderVariable("gl_ClipDistance[i]")); variables.push_front(ShaderVariable("gl_Position")); variables.push_front(ShaderVariable(features.legacy ? "gl_FragColor" : "frag_color")); @@ -285,6 +325,8 @@ void ProgramBuilder::add_shaders(Program &prog) const continue; } + const char *def_uq_name = unqualified_name(def->name); + // See if this variable can satisfy any unresolved variables ShaderVariable *last_resolved = 0; for(list::iterator j=variables.begin(); j!=variables.end(); ++j) @@ -292,7 +334,7 @@ void ProgramBuilder::add_shaders(Program &prog) const if(j->variable) continue; - if(!name_match(def->name, j->resolved_name.c_str())) + if(!name_match(def_uq_name, j->resolved_name.c_str())) continue; if(last_resolved) @@ -335,24 +377,28 @@ void ProgramBuilder::add_shaders(Program &prog) const for(list::iterator i=variables.end(); i!=variables.begin(); ) (--i)->resolve_array(features); + bool legacy_variables = evaluate_flags("g"); for(list::const_iterator i=resolved_vars.begin(); i!=resolved_vars.end(); ++i) - (*i)->check_inline(features.legacy, !optimize); + (*i)->check_inline(legacy_variables, !optimize); prog.attach_shader_owned(new VertexShader(create_source(resolved_vars, VERTEX))); prog.attach_shader_owned(new FragmentShader(create_source(resolved_vars, FRAGMENT))); if(!features.legacy) { - prog.bind_fragment_data(0, "frag_color"); + // OpenGL ES does not support binding fragment shader outputs + if(get_gl_api()!=OPENGL_ES2) + prog.bind_fragment_data(0, "frag_color"); + prog.bind_attribute(VERTEX4, "vertex"); if(features.lighting) 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"); @@ -363,12 +409,36 @@ string ProgramBuilder::create_source(const list &variables, Va { string source; + bool use_blocks = !features.legacy && ARB_uniform_buffer_object; + if(!features.legacy) - source += "#version 130\n"; + { + if(get_gl_api()==OPENGL_ES2) + { + if(use_blocks) + source += "#version 300 es\n"; + } + else + { + source += "#version 130\n"; + if(use_blocks) + source += "#extension GL_ARB_uniform_buffer_object: require\n"; + } + } + + if(get_gl_api()==OPENGL_ES2) + source += "precision mediump float;\n"; 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)) { @@ -376,8 +446,21 @@ string ProgramBuilder::create_source(const list &variables, Va declared_types.insert((*i)->type); } - source += format("uniform %s;\n", (*i)->create_declaration()); + if(!(*i)->resolved_block.empty() && use_blocks) + uniform_blocks.insert((*i)->resolved_block); + else + source += format("uniform %s;\n", (*i)->create_declaration()); } + } + + for(set::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) + { + source += format("uniform %s\n{\n", *i); + for(list::const_iterator j=variables.begin(); j!=variables.end(); ++j) + if((*j)->resolved_block==*i) + source += format("\t%s;\n", (*j)->create_declaration()); + source += "};\n"; + } /* Interface variables need to have global declarations. */ for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) @@ -385,21 +468,25 @@ string ProgramBuilder::create_source(const list &variables, Va if(!(*i)->resolved_name.compare(0, 3, "gl_")) continue; - InterfaceFlags interface = (*i)->get_interface_flags(scope); + InterfaceFlags iface = (*i)->get_interface_flags(scope); - if(interface&INPUT) + 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(interface&OUTPUT) + if(iface&OUTPUT) { const char *qualifier = (features.legacy ? "varying" : "out"); source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope])); } } + // The clip distance array must be declared manually to give it a size + if(scope==VERTEX && features.clipping) + source += format("out float gl_ClipDistance[%d];\n", features.max_clip_planes); + source += "void main()\n{\n"; list loop_vars; @@ -412,8 +499,8 @@ string ProgramBuilder::create_source(const list &variables, Va Output variables are already declared. */ for(list::const_iterator j=loop_vars.begin(); j!=loop_vars.end(); ++j) { - InterfaceFlags interface = (*j)->get_interface_flags(scope); - if(!(*j)->in_loop && !(interface&OUTPUT)) + InterfaceFlags iface = (*j)->get_interface_flags(scope); + if(!(*j)->in_loop && !(iface&OUTPUT)) source += format("\t%s;\n", (*j)->create_declaration()); } @@ -432,13 +519,13 @@ string ProgramBuilder::create_source(const list &variables, Va decl += "[i]"; } const char *oper = ((*j)->array_sum ? "+=" : "="); - source += format("\t\t%s %s %s;\n", decl, oper, (*j)->create_expression("i")); + source += format("\t\t%s %s %s;\n", decl, oper, create_expression(**j, "i")); } - InterfaceFlags interface = (*j)->get_interface_flags(scope); - if(interface&OUTPUT) + InterfaceFlags iface = (*j)->get_interface_flags(scope); + if((iface&(OUTPUT|GOAL))==OUTPUT) { - string expr = ((*j)->inlined ? (*j)->create_expression("i") : (*j)->resolved_name+"[i]"); + string expr = ((*j)->inlined ? create_expression(**j, "i") : (*j)->resolved_name+"[i]"); source += format("\t\t%c_%s[i] = %s;\n", interfaces[scope], (*j)->resolved_name, expr); } } @@ -447,11 +534,11 @@ string ProgramBuilder::create_source(const list &variables, Va loop_vars.clear(); } - InterfaceFlags interface = (*i)->get_interface_flags(scope); + InterfaceFlags iface = (*i)->get_interface_flags(scope); - if((*i)->array_size>1) + if((*i)->array_size>1 || ((*i)->array_size==1 && (iface&GOAL))) { - if((*i)->variable->scope==scope || (interface&OUTPUT)) + if((*i)->variable->scope==scope || (iface&OUTPUT)) { loop_size = (*i)->array_size; loop_vars.push_back(*i); @@ -461,13 +548,13 @@ string ProgramBuilder::create_source(const list &variables, Va if((*i)->variable->scope==scope && !(*i)->inlined) { - string decl = ((interface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration()); - source += format("\t%s = %s;\n", decl, (*i)->create_expression()); + string decl = ((iface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration()); + source += format("\t%s = %s;\n", decl, create_expression(**i)); } - if((interface&(OUTPUT|GOAL))==OUTPUT) + if((iface&(OUTPUT|GOAL))==OUTPUT) { - string expr = ((*i)->inlined ? (*i)->create_expression() : (*i)->resolved_name); + string expr = ((*i)->inlined ? create_expression(**i) : (*i)->resolved_name); source += format("\t%c_%s = %s;\n", interfaces[scope], (*i)->resolved_name, expr); } } @@ -504,6 +591,14 @@ bool ProgramBuilder::evaluate_flags(const char *flags) const return cond; } +const char *ProgramBuilder::unqualified_name(const char *name) +{ + for(const char *p=name; *p; ++p) + if(*p==':' && *++p==':') + name = p+1; + return name; +} + ProgramBuilder::MatchType ProgramBuilder::name_match(const char *n1, const char *n2, const char **space) { int i = 0; @@ -603,7 +698,7 @@ vector ProgramBuilder::extract_identifiers(const char *expression) return result; } -string ProgramBuilder::replace_identifiers(const char *expression, const map &replace_map) +string ProgramBuilder::replace_identifiers(const char *expression, const map &replace_map, bool with_functions) { string result; const char *ptr = expression; @@ -615,7 +710,35 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map::const_iterator i = replace_map.find(identifier); if(i!=replace_map.end()) + { + if(with_functions && ptr[start+length]=='(') + { + string::size_type lparen = i->second.find('('); + string::size_type rparen = i->second.rfind(')'); + if(lparen!=string::npos && rparen!=string::npos) + { + unsigned level = 1; + unsigned j; + for(j=start+length+1; (ptr[j] && level); ++j) + { + level += (ptr[j]=='('); + level -= (ptr[j]==')'); + } + + if(!level) + { + string subexpr(ptr+start+length, ptr+j); + result += i->second.substr(0, lparen); + result += replace_identifiers(subexpr.c_str(), replace_map, with_functions); + result += i->second.substr(rparen+1); + ptr += j; + continue; + } + } + } + result += i->second; + } else result += identifier; ptr += start+length; @@ -624,6 +747,24 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map(scope-1); + if(enabled_scopes&(1<=Version(1, 30))) -{ } + clipping(false), + max_clip_planes(1), + geometry(false) +{ + if(get_gl_api()==OPENGL_ES2) + legacy = get_glsl_version()name); + MatchType match = name_match(var_uq_name, resolved_name.c_str(), &space); + + if(var_uq_name!=variable->name) + resolved_block.assign(variable->name, var_uq_name-2); if(match==FUZZY) resolve_space(string(space, 3)); @@ -736,7 +893,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; @@ -753,7 +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 = feat.max_clip_planes; else if(isnumrc(array_subscript)) array_size = lexical_cast(array_subscript); else @@ -777,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); } } @@ -799,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; @@ -873,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; @@ -911,8 +1070,11 @@ string ProgramBuilder::ShaderVariable::create_type_declaration() const throw invalid_variable_definition("invalid typedef"); } -string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool loop) 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, '['); @@ -924,24 +1086,25 @@ string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool l if(!array_sum && array_size>1 && !loop) array = format("[%d]", array_size); - if(interface) - return format("%s %c_%s%s", variable->type, interface, resolved_name, array); + if(iface) + return format("%s %c_%s%s", variable->type, iface, resolved_name, array); else 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 interface = NO_INTERFACE; + InterfaceFlags iface = NO_INTERFACE; if(variable) { - interface = get_interface_flags(from_scope); - if((interface&INPUT) && interfaces[from_scope-1]) - replacement = format("%c_%s", interfaces[from_scope-1], replacement); + iface = get_interface_flags(from_scope); + 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; @@ -960,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; } @@ -980,16 +1143,23 @@ string ProgramBuilder::ShaderVariable::create_expression(const char *loop) const ProgramBuilder::StandardFeatures::Loader::Loader(StandardFeatures &f): DataFile::ObjectLoader(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