X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=f22d1088bad265853e5e94d46e71e92f17a0a268;hb=825a334729ded60f7b554af4b2d5ab57122efbe9;hp=4043fc4471648f6dec62d611c7cf07479548c545;hpb=8e9d872c2ba8dc633d29a673ba93adf38d262a5c;p=libs%2Fgl.git diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 4043fc44..f22d1088 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -1,5 +1,8 @@ #include +#include #include +#include +#include "extension.h" #include "program.h" #include "programbuilder.h" #include "shader.h" @@ -19,6 +22,7 @@ Naming conventions: eye_* Eye space tbn_* Tangent-Binormal-Normal space shd_* Shadow space + env_* Environment space *_dir Direction vector zzz_* Wildcard space, resolved by the builder @@ -36,54 +40,68 @@ Naming conventions: /* The array are stored in reverse order, so that variables always come after anything that might need them. */ -const ProgramBuilder::StandardVariable ProgramBuilder::standard_variables[] = +const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { - { FRAGMENT, "gl_FragColor", 0, "color_base", "!t" }, - { FRAGMENT, "gl_FragColor", 0, "tex_sample", "!l!s!mt" }, - { FRAGMENT, "gl_FragColor", 0, "tex_sample*color_base", "l|s|mt" }, + { FRAGMENT, "gl_FragColor", "vec4", "frag_color", "g" }, + { FRAGMENT, "frag_color", "vec4", "color_base", "!t" }, + { FRAGMENT, "frag_color", "vec4", "tex_sample", "!l!s!mt" }, + { FRAGMENT, "frag_color", "vec4", "tex_sample*color_base", "l|s|mt" }, { FRAGMENT, "color_base", "vec4", "vec4(1.0)", "!l!s!m" }, { FRAGMENT, "color_base", "vec4", "color", "!l!sm" }, { FRAGMENT, "color_base", "vec4", "vec4(vec3(l_shadow), 1.0)", "!ls!m" }, { FRAGMENT, "color_base", "vec4", "color*vec4(vec3(l_shadow), 1.0)", "!lsm" }, - { FRAGMENT, "color_base", "vec4", "vec4(rgb_light_full, 1.0)", "l!m" }, - { FRAGMENT, "color_base", "vec4", "vec4(rgb_light_full, gl_FrontMaterial.diffuse.a)", "lm" }, - { FRAGMENT, "rgb_light_full", "vec3", "rgb_light_shadow+gl_FrontLightModelProduct.sceneColor.rgb", "m" }, + { FRAGMENT, "color_base", "vec4", "vec4(rgb_light_env, 1.0)", "l!m" }, + { FRAGMENT, "color_base", "vec4", "vec4(rgb_light_env, material.diffuse.a)", "lm" }, + { FRAGMENT, "rgb_light_env", "vec3", "rgb_light_full+reflect_sample.rgb*reflectivity", "e" }, + { FRAGMENT, "rgb_light_env", "vec3", "rgb_light_full", "!e" }, + { FRAGMENT, "rgb_light_full", "vec3", "rgb_light_shadow+ambient_product_diffuse.rgb", "m" }, { FRAGMENT, "rgb_light_full", "vec3", "rgb_light_shadow", "!m" }, + { FRAGMENT, "ambient_product_diffuse", "vec4", "gl_FrontLightModelProduct.sceneColor", "g" }, + { FRAGMENT, "ambient_product_diffuse", "vec4", "ambient_color*material.diffuse", "!g" }, { FRAGMENT, "rgb_light_shadow", "vec3", "rgb_light*l_shadow", "s" }, { FRAGMENT, "rgb_light_shadow", "vec3", "rgb_light", "!s" }, - { FRAGMENT, "rgb_light", "vec3", "vec3(l_diffuse)", "!m!p" }, - { FRAGMENT, "rgb_light", "vec3", "vec3(l_diffuse+l_specular)", "!mp" }, - { FRAGMENT, "rgb_light", "vec3", "l_diffuse*gl_FrontLightProduct[0].diffuse.rgb", "m!p" }, - { FRAGMENT, "rgb_light", "vec3", "l_diffuse*gl_FrontLightProduct[0].diffuse.rgb+l_specular*gl_FrontLightProduct[0].specular.rgb", "mp" }, + { FRAGMENT, "rgb_light[i]", "vec3", "vec3(l_diffuse[i])", "!m!p" }, + { FRAGMENT, "rgb_light[i]", "vec3", "vec3(l_diffuse[i]+l_specular[i])", "!mp" }, + { FRAGMENT, "rgb_light[i]", "vec3", "l_diffuse[i]*light_product_diffuse[i].rgb", "m!p" }, + { FRAGMENT, "rgb_light[i]", "vec3", "l_diffuse[i]*light_product_diffuse[i].rgb+l_specular[i]*light_product_specular[i].rgb", "mp" }, + { FRAGMENT, "light_product_diffuse[i]", "vec4", "gl_FrontLightProduct[i].diffuse", "g" }, + { FRAGMENT, "light_product_diffuse[i]", "vec4", "light_sources[i].diffuse*material.diffuse", "!g" }, + { FRAGMENT, "light_product_specular[i]", "vec4", "gl_FrontLightProduct[i].specular", "g" }, + { FRAGMENT, "light_product_specular[i]", "vec4", "light_sources[i].specular*material.specular", "!g" }, + { FRAGMENT, "reflect_sample", "vec4", "textureCube(environment, env_reflect_dir)", 0 }, + { FRAGMENT, "env_reflect_dir", "vec3", "env_eye_matrix*eye_reflect_dir", 0 }, + { FRAGMENT, "eye_reflect_dir", "vec3", "eye_tbn_matrix*tbn_reflect_dir", "n" }, + { FRAGMENT, "zzz_reflect_dir", "vec3", "reflect(zzz_incident_dir, n_zzz_normal)", 0 }, { FRAGMENT, "l_shadow", "float", "mix(1.0, shadow_sample, shadow_darkness)", 0 }, { FRAGMENT, "shadow_sample", "float", "shadow2D(shadow, shd_vertex).r", 0 }, - { FRAGMENT, "l_diffuse", "float", "max(dot(n_zzz_normal, n_zzz_light_dir), 0.0)", 0 }, - { FRAGMENT, "l_specular", "float", "pow(max(dot(n_zzz_half_vec, n_zzz_normal), 0.0), gl_FrontMaterial.shininess)", 0 }, - { FRAGMENT, "n_zzz_half_vec", "vec3", "normalize(zzz_light_dir-zzz_incident_dir)", 0 }, - { FRAGMENT, "n_zzz_light_dir", "vec3", "normalize(zzz_light_dir)", 0 }, - { FRAGMENT, "n_tbn_normal", "vec3", "texture2D(normalmap, texture_coord).xyz*2.0-1.0", "n" }, + { FRAGMENT, "l_diffuse[i]", "float", "max(dot(n_zzz_normal, n_zzz_light_dir[i]), 0.0)", 0 }, + { FRAGMENT, "l_specular[i]", "float", "pow(max(dot(n_zzz_half_vec[i], n_zzz_normal), 0.0), material.shininess)", 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 }, - { VERTEX, "gl_Position", 0, "gl_ProjectionMatrix*eye_vertex", 0 }, - { VERTEX, "shd_vertex", "vec3", "eye_vertex*eye_shd_rmatrix", 0 }, - { VERTEX, "eye_shd_rmatrix", "mat4", "mat4(gl_EyePlaneS[shadow_unit], gl_EyePlaneT[shadow_unit], gl_EyePlaneR[shadow_unit], vec4(0.0, 0.0, 0.0, 1.0))", 0 }, - { VERTEX, "tbn_light_dir", "vec3", "eye_light_dir*eye_tbn_matrix", 0 }, - { VERTEX, "eye_light_dir", "vec3", "normalize(gl_LightSource[0].position.xyz-eye_vertex.xyz*gl_LightSource[0].position.w)", 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, "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 }, + { VERTEX, "eye_light_position[i]", "vec4", "light_sources[i].position", 0 }, { VERTEX, "tbn_incident_dir", "vec3", "eye_incident_dir*eye_tbn_matrix", 0 }, { VERTEX, "eye_incident_dir", "vec3", "normalize(eye_vertex.xyz)", 0 }, { VERTEX, "eye_tbn_matrix", "mat3", "mat3(eye_tangent, eye_binormal, eye_normal)", 0 }, - { VERTEX, "eye_vertex", "vec4", "gl_ModelViewMatrix*gl_Vertex", "!r" }, - { VERTEX, "eye_vertex", "vec4", "transform_vertex(gl_Vertex)", "r" }, - { VERTEX, "eye_normal", "vec3", "gl_NormalMatrix*gl_Normal", "!r" }, - { VERTEX, "eye_normal", "vec3", "transform_normal(gl_Normal)", "r" }, - { VERTEX, "eye_tangent", "vec3", "gl_NormalMatrix*tangent", "!r" }, - { VERTEX, "eye_tangent", "vec3", "transform_normal(tangent)", "r" }, - { VERTEX, "eye_binormal", "vec3", "gl_NormalMatrix*binormal", "!r" }, - { VERTEX, "eye_binormal", "vec3", "transform_normal(binormal)", "r" }, - { VERTEX, "color", "vec4", "gl_Color", 0 }, - { VERTEX, "texture_coord", "vec2", "gl_MultiTexCoord0.xy", 0 }, - + { VERTEX, "eye_vertex", "vec4", "eye_obj_matrix*vertex", 0 }, + { VERTEX, "eye_normal", "vec3", "eye_obj_normal_matrix*normal", 0 }, + { VERTEX, "eye_tangent", "vec3", "eye_obj_normal_matrix*tangent", 0 }, + { VERTEX, "eye_binormal", "vec3", "eye_obj_normal_matrix*binormal", 0 }, + { VERTEX, "texture_coord", "vec2", "texcoord.xy", 0 }, + + { ATTRIBUTE, "vertex", "vec4", "gl_Vertex", 0 }, + { ATTRIBUTE, "texcoord", "vec4", "gl_MultiTexCoord0", 0 }, + { ATTRIBUTE, "color", "vec4", "gl_Color", 0 }, + { ATTRIBUTE, "normal", "vec3", "gl_Normal", 0 }, { ATTRIBUTE, "tangent", "vec3", 0, 0 }, { ATTRIBUTE, "binormal", "vec3", 0, 0 }, @@ -92,16 +110,105 @@ const ProgramBuilder::StandardVariable ProgramBuilder::standard_variables[] = { UNIFORM, "shadow", "sampler2DShadow", 0, 0 }, { UNIFORM, "shadow_darkness", "float", 0, 0 }, { UNIFORM, "normalmap", "sampler2D", 0, 0 }, + { UNIFORM, "environment", "samplerCube", 0, 0 }, + { UNIFORM, "env_eye_matrix", "mat3", 0, 0 }, + { UNIFORM, "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", "struct { vec4 position; vec4 diffuse; vec4 specular; }[MAX_LIGHTS]", "gl_LightSource[i]", 0 }, + { UNIFORM, "ambient_color", "vec4", 0, 0 }, + { UNIFORM, "material", "struct { vec4 ambient; vec4 diffuse; vec4 specular; float shininess; }", "gl_FrontMaterial", 0 }, // Terminator entry - { NO_SCOPE, 0, 0, 0, 0 } + { NO_SCOPE, 0, 0, 0, 0 } }; +const char ProgramBuilder::interfaces[] = { 0, 0, 0, 'v', 0 }; + ProgramBuilder::ProgramBuilder(const StandardFeatures &f): features(f), feature_flags(features.create_flags()), optimize(true) -{ } +{ + if(!features.custom.empty()) + { + const char *whitespace = " \t\n"; + string::size_type start = 0; + while(1) + { + start = features.custom.find_first_not_of(whitespace, start); + if(start==string::npos) + break; + + string::size_type semicolon = features.custom.find(';', start); + if(semicolon==start) + { + ++start; + continue; + } + else if(semicolon==string::npos) + throw invalid_variable_definition(features.custom.substr(start)); + + string::size_type equals = features.custom.find('=', start); + if(equals>semicolon) + equals = string::npos; + + VariableDefinition var; + string::size_type decl_end = min(equals, semicolon); + for(unsigned i=0;; ++i) + { + string::size_type word_end = features.custom.find_first_of(whitespace, start); + word_end = min(word_end, decl_end); + features.custom[word_end] = 0; + + const char *word = &features.custom[start]; + if(i==0) + { + if(!strcmp(word, "uniform")) + var.scope = UNIFORM; + else if(!strcmp(word, "attribute")) + var.scope = ATTRIBUTE; + else if(!strcmp(word, "vertex")) + var.scope = VERTEX; + else if(!strcmp(word, "fragment")) + var.scope = FRAGMENT; + else + throw invalid_variable_definition(word); + } + else if(i==1) + var.type = word; + else if(i==2) + var.name = word; + + start = features.custom.find_first_not_of(whitespace, word_end+1); + if(start>=decl_end) + break; + } + + if(equals!=string::npos) + { + 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 + var.expression = 0; + + var.flags = 0; + for(const VariableDefinition *j=standard_variables; j->name; ++j) + if(!strcmp(var.name, j->name)) + var.flags = "o"; + + custom_variables.push_front(var); + + start = semicolon+1; + } + } +} void ProgramBuilder::set_optimize(bool o) { @@ -121,13 +228,26 @@ void ProgramBuilder::add_shaders(Program &prog) const list resolved_vars; variables.push_front(ShaderVariable("gl_Position")); - variables.push_front(ShaderVariable("gl_FragColor")); + variables.push_front(ShaderVariable(features.legacy ? "gl_FragColor" : "frag_color")); - for(const StandardVariable *i=standard_variables; i->name; ++i) + list::const_iterator next_custom = custom_variables.begin(); + for(const VariableDefinition *i=standard_variables; i->name; ) { - // Skip over anything that isn't used with the supplied flags - if(i->flags && !evaluate_flags(i->flags)) - continue; + const VariableDefinition *def = 0; + if(next_custom!=custom_variables.end() && (!strcmp(next_custom->name, i->name) || !next_custom->flags)) + { + def = &*next_custom; + ++next_custom; + } + else + { + def = i; + ++i; + + // Skip over anything that isn't used with the supplied flags + if(def->flags && !evaluate_flags(def->flags)) + continue; + } // See if this variable can satisfy any unresolved variables ShaderVariable *last_resolved = 0; @@ -136,7 +256,7 @@ void ProgramBuilder::add_shaders(Program &prog) const if(j->variable) continue; - if(!name_match(i->name, j->resolved_name.c_str())) + if(!name_match(def->name, j->resolved_name.c_str())) continue; if(last_resolved) @@ -148,15 +268,15 @@ void ProgramBuilder::add_shaders(Program &prog) const continue; } - j->resolve(*i); + j->resolve(*def); resolved_vars.push_front(&*j); if(!j->fuzzy_space) last_resolved = &*j; - if(!i->expression) + if(!def->expression) continue; - vector identifiers = extract_identifiers(i->expression); + vector identifiers = extract_identifiers(def->expression); for(vector::const_iterator k=identifiers.begin(); k!=identifiers.end(); ++k) { // Use an existing variable if possible, but only if it's not fuzzy @@ -175,15 +295,27 @@ void ProgramBuilder::add_shaders(Program &prog) const } } - if(optimize) - { - for(list::const_iterator i=resolved_vars.begin(); i!=resolved_vars.end(); ++i) - (*i)->check_inline(); - } + // Array sizes need to be resolved for inline processing + for(list::iterator i=variables.end(); i!=variables.begin(); ) + (--i)->resolve_array(features); + + for(list::const_iterator i=resolved_vars.begin(); i!=resolved_vars.end(); ++i) + (*i)->check_inline(features.legacy, !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"); + 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) + prog.bind_attribute(TEXCOORD4, "texcoord"); + } if(features.normalmap) { prog.bind_attribute(get_component_type(TANGENT3), "tangent"); @@ -195,56 +327,103 @@ string ProgramBuilder::create_source(const list &variables, Va { string source; + if(!features.legacy) + source += "#version 130\n"; + for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) - if((*i)->variable->scope==UNIFORM && (*i)->is_referenced_from(scope)) - source += format("uniform %s %s;\n", (*i)->variable->type, (*i)->resolved_name); + if((*i)->variable->scope==UNIFORM && (*i)->is_referenced_from(scope) && !(*i)->inlined) + source += format("uniform %s;\n", (*i)->create_declaration()); - if(scope==VERTEX) + /* Interface variables need to have global declarations. */ + for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) { - for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) - if((*i)->variable->scope==ATTRIBUTE) - source += format("attribute %s %s;\n", (*i)->variable->type, (*i)->resolved_name); - } + if(!(*i)->resolved_name.compare(0, 3, "gl_")) + continue; - /* Any variables defined in vertex scope but referenced from fragment scope - should be exported as varyings over the interface. */ - list varyings; - for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) - if((*i)->variable->scope==VERTEX && (*i)->is_referenced_from(FRAGMENT)) + InterfaceFlags interface = (*i)->get_interface_flags(scope); + + if(interface&INPUT) { - varyings.push_back(*i); - source += format("varying %s v_%s;\n", (*i)->variable->type, (*i)->resolved_name); + const char *qualifier = (features.legacy ? scope==VERTEX ? "attribute" : "varying" : "in"); + source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope-1])); } - if(scope==VERTEX && features.transform) - { - // Add the prototypes here, until I come up with something better - source += "vec4 transform_vertex(vec4);\n"; - source += "vec3 transform_normal(vec3);\n"; + if(interface&OUTPUT) + { + const char *qualifier = (features.legacy ? "varying" : "out"); + source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope])); + } } source += "void main()\n{\n"; + list loop_vars; + unsigned loop_size = 0; for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) - if((*i)->variable->scope==scope && !(*i)->inlined) + { + if(!loop_vars.empty() && !loop_vars.back()->in_loop && (*i)->array_size!=loop_size) { - source += '\t'; - if((*i)->variable->type) + /* Declare all variables that need to be visible outside the loop. + Output variables are already declared. */ + for(list::const_iterator j=loop_vars.begin(); j!=loop_vars.end(); ++j) { - source += (*i)->variable->type; - source += ' '; + InterfaceFlags interface = (*j)->get_interface_flags(scope); + if(!(*j)->in_loop && !(interface&OUTPUT)) + source += format("\t%s;\n", (*j)->create_declaration()); } - source += format("%s = %s;\n", (*i)->resolved_name, (*i)->get_expression()); + + source += format("\tfor(int i=0; i<%d; ++i)\n\t{\n", loop_size); + for(list::const_iterator j=loop_vars.begin(); j!=loop_vars.end(); ++j) + { + if((*j)->variable->scope==scope && !(*j)->inlined) + { + string decl; + if((*j)->in_loop) + decl = (*j)->create_declaration(0, true); + else + { + decl = (*j)->resolved_name; + if(!(*j)->array_sum) + decl += "[i]"; + } + const char *oper = ((*j)->array_sum ? "+=" : "="); + source += format("\t\t%s %s %s;\n", decl, oper, (*j)->create_expression("i")); + } + + InterfaceFlags interface = (*j)->get_interface_flags(scope); + if(interface&OUTPUT) + { + string expr = ((*j)->inlined ? (*j)->create_expression("i") : (*j)->resolved_name+"[i]"); + source += format("\t\t%c_%s[i] = %s;\n", interfaces[scope], (*j)->resolved_name, expr); + } + } + source += "\t}\n"; + + loop_vars.clear(); } - if(scope==VERTEX) - { - for(list::const_iterator i=varyings.begin(); i!=varyings.end(); ++i) + InterfaceFlags interface = (*i)->get_interface_flags(scope); + + if((*i)->array_size>1) { - if((*i)->inlined) - source += format("\tv_%s = %s;\n", (*i)->resolved_name, (*i)->get_expression()); - else - source += format("\tv_%s = %s;\n", (*i)->resolved_name, (*i)->resolved_name); + if((*i)->variable->scope==scope || (interface&OUTPUT)) + { + loop_size = (*i)->array_size; + loop_vars.push_back(*i); + } + continue; + } + + 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()); + } + + if((interface&(OUTPUT|GOAL))==OUTPUT) + { + string expr = ((*i)->inlined ? (*i)->create_expression() : (*i)->resolved_name); + source += format("\t%c_%s = %s;\n", interfaces[scope], (*i)->resolved_name, expr); } } @@ -280,7 +459,7 @@ bool ProgramBuilder::evaluate_flags(const char *flags) const return cond; } -ProgramBuilder::MatchLevel ProgramBuilder::name_match(const char *n1, const char *n2, const char **space) +ProgramBuilder::MatchType ProgramBuilder::name_match(const char *n1, const char *n2, const char **space) { int i = 0; int zzz = -1; @@ -314,13 +493,14 @@ ProgramBuilder::MatchLevel ProgramBuilder::name_match(const char *n1, const char ++n2; ++i; } - return (!*n1 && !*n2) ? zzz>=0 ? FUZZY : EXACT : NO_MATCH; + return (!*n1 && !*n2) ? (zzz>=0 ? FUZZY : EXACT) : ((*n1=='[' || *n2=='[') ? ARRAY : NO_MATCH); } bool ProgramBuilder::parse_identifier(const char *ptr, unsigned &start, unsigned &length) { bool found = false; bool member = false; + bool subscript = false; for(const char *i=ptr;; ++i) { if(!found) @@ -342,10 +522,23 @@ bool ProgramBuilder::parse_identifier(const char *ptr, unsigned &start, unsigned } else { - if(!isalnum(*i) && *i!='_') + if(subscript) + { + if(*i==']') + { + length = i+1-(ptr+start); + return true; + } + else if(!isalpha(*i) || i>ptr+start+length+1) + return true; + } + else if(!isalnum(*i) && *i!='_') { length = i-(ptr+start); - return true; + if(*i=='[') + subscript = true; + else + return true; } } } @@ -355,7 +548,8 @@ vector ProgramBuilder::extract_identifiers(const char *expression) { vector result; const char *ptr = expression; - unsigned start, length; + unsigned start = 0; + unsigned length = 0; while(parse_identifier(ptr, start, length)) { result.push_back(string(ptr+start, length)); @@ -368,7 +562,8 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map=Version(1, 30))) { } string ProgramBuilder::StandardFeatures::create_flags() const @@ -415,8 +611,8 @@ string ProgramBuilder::StandardFeatures::create_flags() const flags += 's'; if(reflection) flags += 'e'; - if(transform) - flags += 'r'; + if(legacy) + flags += 'g'; return flags; } @@ -427,16 +623,36 @@ ProgramBuilder::ShaderVariable::ShaderVariable(const std::string &n): variable(0), resolved_name(n), fuzzy_space(name.find("zzz")!=string::npos), + array_sum(false), + array_size(0), inlined(false), - inline_parens(false) -{ } + inline_parens(false), + in_loop(false) +{ + string::size_type bracket = name.find('['); + if(bracket!=string::npos) + array_subscript = name.substr(bracket+1, name.size()-bracket-2); +} -void ProgramBuilder::ShaderVariable::resolve(const StandardVariable &var) +void ProgramBuilder::ShaderVariable::resolve(const VariableDefinition &var) { variable = &var; const char *space = 0; - if(name_match(var.name, resolved_name.c_str(), &space)==FUZZY) + MatchType match = name_match(var.name, resolved_name.c_str(), &space); + + if(match==FUZZY) resolve_space(string(space, 3)); + else if(match==ARRAY) + { + if(array_subscript.empty()) + array_sum = true; + else if(var.scope==UNIFORM) + { + const char *bracket = strrchr(variable->type, '['); + if(bracket) + array_subscript = string(bracket+1, strlen(bracket)-2); + } + } } void ProgramBuilder::ShaderVariable::resolve(ShaderVariable &var) @@ -466,6 +682,51 @@ void ProgramBuilder::ShaderVariable::resolve_space(const string &space) (*i)->resolve_space(space); } +void ProgramBuilder::ShaderVariable::resolve_array(const StandardFeatures &features, unsigned size_hint) +{ + if(array_size) + return; + if(!array_sum && array_subscript.empty()) + return; + + if(!array_subscript.empty()) + { + string::size_type bracket = resolved_name.find('['); + if(bracket!=string::npos) + resolved_name = resolved_name.substr(0, bracket); + } + + if(variable && variable->scope==UNIFORM) + { + if(array_subscript=="MAX_LIGHTS") + array_size = features.max_lights; + else if(isnumrc(array_subscript)) + array_size = lexical_cast(array_subscript); + else + throw invalid_variable_definition("invalid array size"); + } + + if(!array_size) + { + for(list::const_iterator i=referenced_vars.begin(); i!=referenced_vars.end(); ++i) + if((*i)->array_size) + { + array_size = (*i)->array_size; + break; + } + } + + if(!array_size && size_hint) + array_size = size_hint; + + if(array_size) + { + 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); + } +} + void ProgramBuilder::ShaderVariable::add_reference(ShaderVariable &var) { referenced_vars.push_back(&var); @@ -482,16 +743,54 @@ void ProgramBuilder::ShaderVariable::update_reference(ShaderVariable &from, Shad resolve_space(to.resolved_space); } -void ProgramBuilder::ShaderVariable::check_inline() +void ProgramBuilder::ShaderVariable::check_inline(bool allow_legacy, bool trivial_only) { if(variable->expression) { - unsigned total_refs = referenced_by.size(); + if(array_sum && array_size>1) + return; + if(!allow_legacy && !strncmp(variable->expression, "gl_", 3)) + return; + + // Never inline goal variables + if(referenced_by.empty()) + return; + + // Inline an expression consisting of a single identifier + unsigned start, length; + if(parse_identifier(variable->expression, start, length)) + if(start==0 && variable->expression[length]==0) + { + inlined = true; + return; + } + + if(trivial_only) + return; + + /* If all references to the variable come from arrays in the same scope + and of the same size, the variable can be embedded in the loop. */ + in_loop = (array_size>1 && !array_sum); + for(list::const_iterator i=referenced_by.begin(); i!=referenced_by.end(); ++i) + if((*i)->variable->scope!=variable->scope || (*i)->array_size!=array_size) + in_loop = false; + + /* Count all refs to this variable. Refs from array variables count once + per loop iteration. */ + unsigned total_refs = 0; unsigned in_scope_refs = 0; for(list::const_iterator i=referenced_by.begin(); i!=referenced_by.end(); ++i) + { + unsigned count = max((*i)->array_size*!in_loop, 1U); + total_refs += count; if((*i)->variable->scope==variable->scope) - ++in_scope_refs; - if(total_refs==1 || (total_refs>0 && in_scope_refs==0)) + in_scope_refs += count; + } + + /* Inline if there's only one ref, or if all refs are in other scopes. + In the latter case, the actual inlining will happen in the interface + variable assignment. */ + if(total_refs==1 || in_scope_refs==0) { inlined = true; unsigned level = 0; @@ -516,24 +815,91 @@ bool ProgramBuilder::ShaderVariable::is_referenced_from(VariableScope scope) con return false; } -string ProgramBuilder::ShaderVariable::get_expression() const +ProgramBuilder::InterfaceFlags ProgramBuilder::ShaderVariable::get_interface_flags(VariableScope scope) const { - map replace_map; - for(list::const_iterator i=referenced_vars.begin(); i!=referenced_vars.end(); ++i) - if((*i)->variable) + /* Uniforms are available to all stages and are not passed through + interfaces */ + if(variable->scope==UNIFORM) + return NO_INTERFACE; + + int flags = NO_INTERFACE; + + for(list::const_iterator i=referenced_by.begin(); i!=referenced_by.end(); ++i) + { + /* Variables used in a later scope than they are declared in need to go + through the interface */ + if((*i)->variable->scope>scope && variable->scope<=scope) + flags |= OUTPUT; + if((*i)->variable->scope>=scope && variable->scopescope!=ATTRIBUTE || scope!=VERTEX) + flags |= INPUT; + } + + // Variables without any references are goals and also outputs. + if(referenced_by.empty() && variable->scope==scope) + flags |= OUTPUT|GOAL; + + return static_cast(flags); +} + +string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool loop) const +{ + if(variable->scope==UNIFORM && !array_subscript.empty()) + { + const char *bracket = strrchr(variable->type, '['); + if(bracket) + return format("%s %s[%d]", string(variable->type, bracket), resolved_name, array_size); + } + + string array; + 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); + else + return format("%s %s%s", variable->type, resolved_name, array); +} + +string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, const char *loop) const +{ + string replacement = resolved_name; + InterfaceFlags interface = 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); + else if(inlined) { - string replacement = (*i)->resolved_name; - if(variable->scope==FRAGMENT && (*i)->variable->scope==VERTEX) - replacement = "v_"+replacement; - else if((*i)->inlined) - { - replacement = (*i)->get_expression(); - if((*i)->inline_parens) - replacement = "("+replacement+")"; - } - if(replacement!=(*i)->name) - replace_map[(*i)->name] = replacement; + replacement = create_expression(loop); + if(inline_parens) + replacement = "("+replacement+")"; + return replacement; } + } + + // Add an array subscript, unless the variable is embedded in a loop + if(!array_subscript.empty() && !in_loop) + { + if(loop) + return format("%s[%s]", replacement, loop); + else if(!variable || variable->scope==UNIFORM) + return replacement+"[0]"; + } + + return replacement; +} + +string ProgramBuilder::ShaderVariable::create_expression(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); + if(replacement!=(*i)->name) + replace_map[(*i)->name] = replacement; + } if(replace_map.empty()) return variable->expression; @@ -545,14 +911,15 @@ string ProgramBuilder::ShaderVariable::get_expression() const ProgramBuilder::StandardFeatures::Loader::Loader(StandardFeatures &f): DataFile::ObjectLoader(f) { + add("custom", &StandardFeatures::custom); add("lighting", &StandardFeatures::lighting); add("material", &StandardFeatures::material); + add("max_lights", &StandardFeatures::max_lights); add("normalmap", &StandardFeatures::normalmap); add("reflection", &StandardFeatures::reflection); add("shadow", &StandardFeatures::shadow); add("specular", &StandardFeatures::specular); add("texture", &StandardFeatures::texture); - add("transform", &StandardFeatures::transform); } } // namespace GL