X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=dc4bd19cacce0f146436bee57420946f6200321b;hb=f51eae2c41aeac49e82ce233d5c3a16482926700;hp=1e8f55773de8081a9ae99504289df7d7e5418f63;hpb=f1b12c992db974c679d85ae6ec22cd318199d0d5;p=libs%2Fgl.git diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 1e8f5577..dc4bd19c 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -44,7 +44,7 @@ Naming conventions: anything that might need them. */ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { - { FRAGMENT, "gl_FragColor", "vec4", "frag_color", "g" }, + { FRAGMENT, "gl_FragColor", "vec4", "frag_color", 0 }, { 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" }, @@ -59,21 +59,21 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { 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!t" }, - { FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse*tex_sample.rgb", "!mt" }, + { 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 }, @@ -88,14 +88,14 @@ 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 }, @@ -103,7 +103,7 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { 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, "diffuse_sample", "vec4", "texture2D(diffusemap, texture_coord)", 0 }, { VERTEX, "gl_Position", "vec4", "projection_matrix*eye_vertex", 0 }, { VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", 0 }, @@ -127,15 +127,15 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { ATTRIBUTE, "tangent", "vec3", 0, 0 }, { ATTRIBUTE, "binormal", "vec3", 0, 0 }, - { UNIFORM, "texture", "sampler2D", 0, 0 }, + { UNIFORM, "diffusemap", "sampler2D", 0, 0 }, { UNIFORM, "shadow", "sampler2DShadow", 0, 0 }, { UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 }, { UNIFORM, "normalmap", "sampler2D", 0, 0 }, { UNIFORM, "environment", "samplerCube", 0, 0 }, { UNIFORM, "EnvMap::env_eye_matrix", "mat3", 0, 0 }, { UNIFORM, "Material::reflectivity", "float", 0, 0 }, - { UNIFORM, "Transform::eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 }, - { UNIFORM, "Transform::eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 }, + { UNIFORM, "eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 }, + { UNIFORM, "eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 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 }, @@ -235,6 +235,14 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f): start = semicolon+1; } } + + if(!features.legacy) + { + aliases["texture2D"] = "texture"; + aliases["shadow2D"] = "texture"; + } + else + aliases["shadow2D"] = "shadow2D(...).r"; } void ProgramBuilder::set_optimize(bool o) @@ -337,15 +345,19 @@ 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"); @@ -369,9 +381,18 @@ string ProgramBuilder::create_source(const list &variables, Va if(!features.legacy) { - source += "#version 130\n"; - if(use_blocks) - source += "#extension GL_ARB_uniform_buffer_object: require\n"; + if(get_gl_api()==OPENGL_ES2) + { + if(use_blocks) + source += "#version 300 es\n"; + source += "precision mediump float;\n"; + } + else + { + source += "#version 130\n"; + if(use_blocks) + source += "#extension GL_ARB_uniform_buffer_object: require\n"; + } } set declared_types; @@ -406,15 +427,15 @@ 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])); } - if(interface&OUTPUT) + if(iface&OUTPUT) { const char *qualifier = (features.legacy ? "varying" : "out"); source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope])); @@ -433,8 +454,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()); } @@ -453,13 +474,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) { - 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); } } @@ -468,11 +489,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)->variable->scope==scope || (interface&OUTPUT)) + if((*i)->variable->scope==scope || (iface&OUTPUT)) { loop_size = (*i)->array_size; loop_vars.push_back(*i); @@ -482,13 +503,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); } } @@ -632,7 +653,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; @@ -644,7 +665,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; @@ -653,6 +702,12 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map=Version(1, 30))) -{ } + reflection(false) +{ + if(get_gl_api()==OPENGL_ES2) + legacy = !(get_glsl_version()>=Version(3, 0)); + else + legacy = !(get_glsl_version()>=Version(1, 30)); +} string ProgramBuilder::StandardFeatures::create_flags() const { @@ -688,7 +747,7 @@ string ProgramBuilder::StandardFeatures::create_flags() const flags += 's'; if(reflection) flags += 'e'; - if(legacy) + if(legacy && get_gl_api()==OPENGL) flags += 'g'; return flags; @@ -944,7 +1003,7 @@ 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==UNIFORM && !array_subscript.empty()) { @@ -957,8 +1016,8 @@ 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); } @@ -966,11 +1025,11 @@ string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool l string ProgramBuilder::ShaderVariable::create_replacement(VariableScope from_scope, 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]) + iface = get_interface_flags(from_scope); + if((iface&INPUT) && interfaces[from_scope-1]) replacement = format("%c_%s", interfaces[from_scope-1], replacement); else if(inlined) {