X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=832d5898bb33b44efc6c970a79d8250daf86395c;hb=befd5cf28bbfe1b334d4e96138d35e05ce51b3dd;hp=4dcdaf5ef8969070ccd19001cab0f40e374bde47;hpb=41264797bc55f27411555b3c217a80c791154afc;p=libs%2Fgl.git diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 4dcdaf5e..832d5898 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -58,21 +58,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 }, @@ -87,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 }, @@ -102,11 +103,10 @@ 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", "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, "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 }, @@ -127,20 +127,19 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { ATTRIBUTE, "tangent", "vec3", 0, 0 }, { ATTRIBUTE, "binormal", "vec3", 0, 0 }, - { UNIFORM, "ShadowMap::shadow_unit", "int", 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, "EnvMap::reflectivity", "float", 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, "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", 0, 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 }, @@ -236,6 +235,14 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f): start = semicolon+1; } } + + if((get_gl_api()==OPENGL && !features.legacy) || (get_gl_api()==OPENGL_ES2 && get_glsl_version()>=Version(3, 0))) + { + aliases["texture2D"] = "texture"; + aliases["shadow2D"] = "texture"; + } + else + aliases["shadow2D"] = "shadow2D(...).r"; } void ProgramBuilder::set_optimize(bool o) @@ -346,7 +353,10 @@ void ProgramBuilder::add_shaders(Program &prog) const 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"); @@ -366,13 +376,23 @@ string ProgramBuilder::create_source(const list &variables, Va { string source; + bool legacy_qualifiers = features.legacy || (get_gl_api()==OPENGL_ES2 && !(get_glsl_version()>=Version(3, 0))); bool use_blocks = !features.legacy && ARB_uniform_buffer_object; 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; @@ -411,13 +431,13 @@ string ProgramBuilder::create_source(const list &variables, Va if(interface&INPUT) { - const char *qualifier = (features.legacy ? scope==VERTEX ? "attribute" : "varying" : "in"); + const char *qualifier = (legacy_qualifiers ? scope==VERTEX ? "attribute" : "varying" : "in"); source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope-1])); } if(interface&OUTPUT) { - const char *qualifier = (features.legacy ? "varying" : "out"); + const char *qualifier = (legacy_qualifiers ? "varying" : "out"); source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope])); } } @@ -454,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) { - 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); } } @@ -484,12 +504,12 @@ 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()); + source += format("\t%s = %s;\n", decl, create_expression(**i)); } if((interface&(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); } } @@ -633,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; @@ -645,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; @@ -654,6 +702,12 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map=Version(1, 30))) + legacy(get_gl_api()==OPENGL && !(get_glsl_version()>=Version(1, 30))) { } string ProgramBuilder::StandardFeatures::create_flags() const