From: Mikko Rasa Date: Fri, 26 Sep 2014 14:35:51 +0000 (+0300) Subject: Use uniform blocks in generated shaders if supported X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=41264797bc55f27411555b3c217a80c791154afc;p=libs%2Fgl.git Use uniform blocks in generated shaders if supported --- diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 7df08d08..4dcdaf5e 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include "extension.h" @@ -126,24 +127,24 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { ATTRIBUTE, "tangent", "vec3", 0, 0 }, { ATTRIBUTE, "binormal", "vec3", 0, 0 }, - { UNIFORM, "shadow_unit", "int", 0, 0 }, + { UNIFORM, "ShadowMap::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, "EnvMap::env_eye_matrix", "mat3", 0, 0 }, + { UNIFORM, "EnvMap::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", "LightSourceParameters[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", "MaterialParameters", "gl_FrontMaterial", 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::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 }, @@ -285,6 +286,8 @@ void ProgramBuilder::add_shaders(Program &prog) const 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::iterator j=variables.begin(); j!=variables.end(); ++j) @@ -292,7 +295,7 @@ void ProgramBuilder::add_shaders(Program &prog) const 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) @@ -363,10 +366,17 @@ string ProgramBuilder::create_source(const list &variables, Va { 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 declared_types; + set uniform_blocks; for(list::const_iterator i=variables.begin(); i!=variables.end(); ++i) if((*i)->variable->scope==UNIFORM && (*i)->is_referenced_from(scope) && !(*i)->inlined) { @@ -376,9 +386,21 @@ string ProgramBuilder::create_source(const list &variables, Va declared_types.insert((*i)->type); } - source += format("uniform %s;\n", (*i)->create_declaration()); + if(!(*i)->resolved_block.empty() && use_blocks) + uniform_blocks.insert((*i)->resolved_block); + else + source += format("uniform %s;\n", (*i)->create_declaration()); } + for(set::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) + { + source += format("uniform %s\n{\n", *i); + for(list::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::const_iterator i=variables.begin(); i!=variables.end(); ++i) { @@ -504,6 +526,14 @@ bool ProgramBuilder::evaluate_flags(const char *flags) const 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; @@ -687,7 +717,11 @@ void ProgramBuilder::ShaderVariable::resolve(const VariableDefinition &var) { 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)); diff --git a/source/programbuilder.h b/source/programbuilder.h index 1f9bb846..9860b468 100644 --- a/source/programbuilder.h +++ b/source/programbuilder.h @@ -87,6 +87,7 @@ private: const VariableDefinition *variable; const VariableDefinition *type; std::string resolved_name; + std::string resolved_block; bool fuzzy_space; std::string resolved_space; bool array_sum; @@ -141,6 +142,7 @@ public: private: std::string create_source(const std::list &, VariableScope) const; bool evaluate_flags(const char *) const; + static const char *unqualified_name(const char *); static MatchType name_match(const char *, const char *, const char ** = 0); static bool parse_identifier(const char *, unsigned &, unsigned &); static std::vector extract_identifiers(const char *);