{ 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 },
{ 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_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 },
{ 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 },
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)
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");
{
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<const VariableDefinition *> declared_types;
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]));
}
}
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);
}
}
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);
}
}
return result;
}
-string ProgramBuilder::replace_identifiers(const char *expression, const map<string, string> &replace_map)
+string ProgramBuilder::replace_identifiers(const char *expression, const map<string, string> &replace_map, bool with_functions)
{
string result;
const char *ptr = expression;
string identifier(ptr+start, length);
map<string, string>::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;
return result;
}
+string ProgramBuilder::create_expression(const ShaderVariable &var, const char *loop) const
+{
+ string expr = var.create_expression(loop);
+ return replace_identifiers(expr.c_str(), aliases, true);
+}
+
ProgramBuilder::StandardFeatures::StandardFeatures():
texture(false),
normalmap(false),
shadow(false),
reflection(false),
- legacy(!(get_glsl_version()>=Version(1, 30)))
+ legacy(get_gl_api()==OPENGL && !(get_glsl_version()>=Version(1, 30)))
{ }
string ProgramBuilder::StandardFeatures::create_flags() const
projects / libs / gl.git / blobdiff