X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=8215220081fd2cb6a32a543877bd208e3823fc7f;hb=2e9d7c9f5741d17f77ce27273590ee16b791fb64;hp=1706b9d4ad70c0dc8e362f7c37b754e5df7a02b8;hpb=3101f1e39018b33c74898fa76664ee1cb6326dc3;p=libs%2Fgl.git diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 1706b9d4..82152200 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -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,7 +88,7 @@ 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 }, @@ -103,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 }, @@ -128,8 +127,7 @@ 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 }, @@ -237,6 +235,12 @@ 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"; + } } void ProgramBuilder::set_optimize(bool o) @@ -347,7 +351,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"); @@ -371,9 +378,17 @@ 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"; + } + else + { + source += "#version 130\n"; + if(use_blocks) + source += "#extension GL_ARB_uniform_buffer_object: require\n"; + } } set declared_types; @@ -455,13 +470,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); } } @@ -485,12 +500,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); } } @@ -655,6 +670,12 @@ string ProgramBuilder::replace_identifiers(const char *expression, const map