#include <algorithm>
#include <cstring>
+#include <set>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
#include <msp/strings/format.h>
#include <msp/strings/utils.h>
#include "extension.h"
{ 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*tex_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, "tex_sample", "vec4", "texture2D(texture, 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, "shadow_unit", "int", 0, 0 },
{ UNIFORM, "texture", "sampler2D", 0, 0 },
{ UNIFORM, "shadow", "sampler2DShadow", 0, 0 },
- { UNIFORM, "shadow_darkness", "float", 0, 0 },
+ { UNIFORM, "ShadowMap::shadow_darkness", "float", 0, 0 },
{ UNIFORM, "normalmap", "sampler2D", 0, 0 },
{ UNIFORM, "environment", "samplerCube", 0, 0 },
- { UNIFORM, "env_eye_matrix", "mat3", 0, 0 },
- { UNIFORM, "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, "shd_eye_matrix", "mat4", 0, 0 },
- { UNIFORM, "light_sources", "struct { vec4 position; vec4 diffuse; vec4 specular; }[MAX_LIGHTS]", "gl_LightSource[i]", 0 },
- { UNIFORM, "ambient_color", "vec4", 0, 0 },
- { UNIFORM, "sky_color", "vec4", 0, 0 },
- { UNIFORM, "eye_sky_dir", "vec3", 0, 0 },
- { UNIFORM, "horizon_limit", "float", 0, 0 },
- { UNIFORM, "material", "struct { vec4 ambient; vec4 diffuse; vec4 specular; float shininess; }", "gl_FrontMaterial", 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, "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", "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 },
+ { UNIFORM, "Material::material", "MaterialParameters", "gl_FrontMaterial", 0 },
+
+ { TYPE, "LightSourceParameters", "struct { vec4 position; vec4 diffuse; vec4 specular; }", "gl_LightSourceParameters", 0 },
+ { TYPE, "MaterialParameters", "struct { vec4 ambient; vec4 diffuse; vec4 specular; float shininess; }", "gl_MaterialParameters", 0 },
// Terminator entry
{ NO_SCOPE, 0, 0, 0, 0 }
};
-const char ProgramBuilder::interfaces[] = { 0, 0, 0, 'v', 0 };
+const char ProgramBuilder::interfaces[] = { 0, 0, 0, 0, 'v', 0 };
ProgramBuilder::ProgramBuilder(const StandardFeatures &f):
features(f),
continue;
}
+ if(def->scope==TYPE)
+ {
+ for(list<ShaderVariable *>::iterator j=resolved_vars.begin(); j!=resolved_vars.end(); ++j)
+ if(!(*j)->type && name_match(def->name, (*j)->variable->type))
+ (*j)->resolve_type(*def);
+
+ continue;
+ }
+
+ const char *def_uq_name = unqualified_name(def->name);
+
// See if this variable can satisfy any unresolved variables
ShaderVariable *last_resolved = 0;
for(list<ShaderVariable>::iterator j=variables.begin(); j!=variables.end(); ++j)
if(j->variable)
continue;
- if(!name_match(def->name, j->resolved_name.c_str()))
+ if(!name_match(def_uq_name, j->resolved_name.c_str()))
continue;
if(last_resolved)
{
string source;
+ 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";
+ }
+ set<const VariableDefinition *> declared_types;
+ set<string> uniform_blocks;
for(list<ShaderVariable *>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
if((*i)->variable->scope==UNIFORM && (*i)->is_referenced_from(scope) && !(*i)->inlined)
- source += format("uniform %s;\n", (*i)->create_declaration());
+ {
+ if((*i)->type && !declared_types.count((*i)->type))
+ {
+ source += format("%s;\n", (*i)->create_type_declaration());
+ declared_types.insert((*i)->type);
+ }
+
+ if(!(*i)->resolved_block.empty() && use_blocks)
+ uniform_blocks.insert((*i)->resolved_block);
+ else
+ source += format("uniform %s;\n", (*i)->create_declaration());
+ }
+
+ for(set<string>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
+ {
+ source += format("uniform %s\n{\n", *i);
+ for(list<ShaderVariable *>::const_iterator j=variables.begin(); j!=variables.end(); ++j)
+ if((*j)->resolved_block==*i)
+ source += format("\t%s;\n", (*j)->create_declaration());
+ source += "};\n";
+ }
/* Interface variables need to have global declarations. */
for(list<ShaderVariable *>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
return cond;
}
+const char *ProgramBuilder::unqualified_name(const char *name)
+{
+ for(const char *p=name; *p; ++p)
+ if(*p==':' && *++p==':')
+ name = p+1;
+ return name;
+}
+
ProgramBuilder::MatchType ProgramBuilder::name_match(const char *n1, const char *n2, const char **space)
{
int i = 0;
material(false),
lighting(false),
max_lights(1),
+ skylight(false),
specular(false),
normalmap(false),
shadow(false),
ProgramBuilder::ShaderVariable::ShaderVariable(const std::string &n):
name(n),
variable(0),
+ type(0),
resolved_name(n),
fuzzy_space(name.find("zzz")!=string::npos),
array_sum(false),
{
variable = &var;
const char *space = 0;
- MatchType match = name_match(var.name, resolved_name.c_str(), &space);
+ const char *var_uq_name = unqualified_name(variable->name);
+ MatchType match = name_match(var_uq_name, resolved_name.c_str(), &space);
+
+ if(var_uq_name!=variable->name)
+ resolved_block.assign(variable->name, var_uq_name-2);
if(match==FUZZY)
resolve_space(string(space, 3));
var.referenced_by.insert(var.referenced_by.end(), referenced_by.begin(), referenced_by.end());
}
+void ProgramBuilder::ShaderVariable::resolve_type(const VariableDefinition &var)
+{
+ type = &var;
+}
+
void ProgramBuilder::ShaderVariable::resolve_space(const string &space)
{
if(fuzzy_space)
return static_cast<InterfaceFlags>(flags);
}
+string ProgramBuilder::ShaderVariable::create_type_declaration() const
+{
+ if(!type)
+ throw logic_error("no type");
+
+ if(!strncmp(type->type, "struct", 6))
+ {
+ const char *brace = strchr(type->type, '{');
+ if(brace)
+ return format("struct %s %s", type->name, brace);
+ }
+
+ throw invalid_variable_definition("invalid typedef");
+}
+
string ProgramBuilder::ShaderVariable::create_declaration(char interface, bool loop) const
{
if(variable->scope==UNIFORM && !array_subscript.empty())
projects / libs / gl.git / blobdiff