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" },
{ 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 },
}
}
- if((get_gl_api()==OPENGL && !features.legacy) || (get_gl_api()==OPENGL_ES2 && get_glsl_version()>=Version(3, 0)))
+ if(!features.legacy)
{
+ aliases["texture1D"] = "texture";
aliases["texture2D"] = "texture";
+ aliases["texture3D"] = "texture";
+ aliases["textureCube"] = "texture";
aliases["shadow2D"] = "texture";
}
else
for(list<ShaderVariable>::iterator i=variables.end(); i!=variables.begin(); )
(--i)->resolve_array(features);
+ bool legacy_variables = evaluate_flags("g");
for(list<ShaderVariable *>::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)));
{
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)
}
}
+ if(get_gl_api()==OPENGL_ES2)
+ source += "precision mediump float;\n";
+
set<const VariableDefinition *> declared_types;
set<string> uniform_blocks;
for(list<ShaderVariable *>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
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 = (legacy_qualifiers ? scope==VERTEX ? "attribute" : "varying" : "in");
+ 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 = (legacy_qualifiers ? "varying" : "out");
+ const char *qualifier = (features.legacy ? "varying" : "out");
source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope]));
}
}
Output variables are already declared. */
for(list<ShaderVariable *>::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());
}
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 ? create_expression(**j, "i") : (*j)->resolved_name+"[i]");
source += format("\t\t%c_%s[i] = %s;\n", interfaces[scope], (*j)->resolved_name, expr);
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);
if((*i)->variable->scope==scope && !(*i)->inlined)
{
- string decl = ((interface&GOAL) ? (*i)->resolved_name : (*i)->create_declaration());
+ 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 ? create_expression(**i) : (*i)->resolved_name);
source += format("\t%c_%s = %s;\n", interfaces[scope], (*i)->resolved_name, expr);
specular(false),
normalmap(false),
shadow(false),
- reflection(false),
- legacy(get_gl_api()==OPENGL && !(get_glsl_version()>=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
{
flags += 's';
if(reflection)
flags += 'e';
- if(legacy)
+ if(legacy && get_gl_api()==OPENGL)
flags += 'g';
return flags;
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())
{
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);
}
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)
{
projects / libs / gl.git / blobdiff