X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.cpp;h=60312be8adf8fc09cdb6a55ed76de342b9f3da46;hp=b8c3378cc5ee6e6ff010e3f7b65bde411468b6f6;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=599f50ec34aba2c35dcab9d17d8b9fc6bfbd0a07 diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp index b8c3378c..60312be8 100644 --- a/source/glsl/finalize.cpp +++ b/source/glsl/finalize.cpp @@ -1,8 +1,10 @@ #include +#include #include #include #include "finalize.h" #include "glsl_error.h" +#include "reflect.h" using namespace std; @@ -10,9 +12,236 @@ namespace Msp { namespace GL { namespace SL { -PrecisionConverter::PrecisionConverter(): - stage(0) -{ } +void StructOrganizer::visit(StructDeclaration &strct) +{ + SetForScope set_offset(offset, 0); + TraversingVisitor::visit(strct); +} + +void StructOrganizer::visit(VariableDeclaration &var) +{ + if(offset>=0) + { + int *layout_offset = 0; + bool has_matrix_order = false; + if(var.layout) + { + for(Layout::Qualifier &q: var.layout->qualifiers) + { + if(q.name=="offset" && q.has_value) + { + layout_offset = &q.value; + if(q.value>=offset) + offset = q.value; + } + else if(q.name=="column_major" || q.name=="row_major") + has_matrix_order = true; + } + } + + MemoryRequirementsCalculator::Result mem_reqs = MemoryRequirementsCalculator().apply(var); + offset += mem_reqs.alignment-1; + offset -= offset%mem_reqs.alignment; + + if(layout_offset) + *layout_offset = offset; + else + add_layout_qualifier(var.layout, Layout::Qualifier("offset", offset)); + + if(!has_matrix_order) + { + const BasicTypeDeclaration *basic = dynamic_cast(var.type_declaration); + while(basic && basic->kind==BasicTypeDeclaration::ARRAY) + basic = dynamic_cast(basic->base_type); + if(basic && basic->kind==BasicTypeDeclaration::MATRIX) + add_layout_qualifier(var.layout, Layout::Qualifier("column_major")); + } + + offset += mem_reqs.size; + } +} + + +void LocationAllocator::apply(Module &module, const Features &f, bool a) +{ + features = f; + alloc_new = a; + for(Stage &s: module.stages) + apply(s); + + if(features.target_api!=VULKAN) + allocate_locations("uniform"); + + for(InterfaceBlock *b: unbound_blocks) + bind_uniform(b->layout, b->block_name, features.uniform_binding_range); + for(VariableDeclaration *t: unbound_textures) + bind_uniform(t->layout, t->name, features.texture_binding_range); +} + +void LocationAllocator::apply(Stage &stage) +{ + swap(used_locations["in"], used_locations["out"]); + used_locations["out"].clear(); + + stage.content.visit(*this); + + allocate_locations("in"); + allocate_locations("out"); +} + +void LocationAllocator::allocate_locations(const string &iface) +{ + auto write = unplaced_variables.begin(); + unsigned next = 0; + for(auto i=unplaced_variables.begin(); i!=unplaced_variables.end(); ++i) + { + if((*i)->interface!=iface) + { + if(write!=i) + *write = *i; + ++write; + continue; + } + + if((*i)->interface=="uniform") + { + auto j = uniforms.find((*i)->name); + if(j!=uniforms.end() && j->second.location>=0) + { + add_layout_qualifier((*i)->layout, Layout::Qualifier("location", j->second.location)); + continue; + } + } + + if(!alloc_new) + continue; + + set &used = used_locations[(*i)->interface]; + + unsigned size = LocationCounter().apply(**i); + while(1) + { + int blocking = -1; + for(unsigned j=0; jlayout, Layout::Qualifier("location", next)); + if((*i)->interface=="uniform") + uniforms[(*i)->name].location = next; + + for(unsigned j=0; j &layout, const string &name, unsigned range) +{ + auto i = uniforms.find(name); + + int desc_set = (i!=uniforms.end() ? i->second.desc_set : 0); + if(features.target_api==VULKAN && get_layout_value(layout.get(), "set")<0) + add_layout_qualifier(layout, Layout::Qualifier("set", desc_set)); + + if(i!=uniforms.end() && i->second.bind_point>=0) + add_layout_qualifier(layout, Layout::Qualifier("binding", i->second.bind_point)); + else if(alloc_new) + { + set &used = used_bindings[desc_set]; + + unsigned bind_point = fold32(hash64(name))%range; + while(used.count(bind_point)) + bind_point = (bind_point+1)%range; + + add_layout_qualifier(layout, Layout::Qualifier("binding", bind_point)); + uniforms[name].bind_point = bind_point; + used.insert(bind_point); + } +} + +bool LocationAllocator::visit_uniform(const string &name, RefPtr &layout) +{ + int desc_set = 0; + int bind_point = get_layout_value(layout.get(), "binding"); + + if(features.target_api==VULKAN) + { + desc_set = get_layout_value(layout.get(), "set"); + if(desc_set<0 && bind_point>=0) + { + desc_set = 0; + add_layout_qualifier(layout, Layout::Qualifier("set", desc_set)); + } + + if(desc_set>=0) + uniforms[name].desc_set = desc_set; + } + + if(bind_point>=0) + { + used_bindings[desc_set].insert(bind_point); + uniforms[name].bind_point = bind_point; + } + + return bind_point>=0; +} + +void LocationAllocator::visit(VariableDeclaration &var) +{ + if(!var.name.compare(0, 3, "gl_")) + return; + + if(!var.interface.empty()) + { + int location = get_layout_value(var.layout.get(), "location"); + + if(location<0 && var.linked_declaration && var.linked_declaration->layout) + { + location = get_layout_value(var.linked_declaration->layout.get(), "location"); + if(location>=0) + add_layout_qualifier(var.layout, Layout::Qualifier("location", location)); + } + + if(location>=0) + { + unsigned size = LocationCounter().apply(var); + for(unsigned i=0; i(base_type) && !visit_uniform(var.name, var.layout)) + unbound_textures.push_back(&var); + } +} + +void LocationAllocator::visit(InterfaceBlock &iface) +{ + if(!iface.instance_name.compare(0, 3, "gl_")) + return; + + if(iface.interface=="uniform") + { + bool push_constant = has_layout_qualifier(iface.layout.get(), "push_constant"); + if(!push_constant && !visit_uniform(iface.block_name, iface.layout)) + unbound_blocks.push_back(&iface); + } +} + void PrecisionConverter::apply(Stage &s) { @@ -23,7 +252,7 @@ void PrecisionConverter::apply(Stage &s) void PrecisionConverter::visit(Block &block) { - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) + for(auto i=block.body.begin(); i!=block.body.end(); ++i) { if(&block==&stage->content) insert_point = i; @@ -33,7 +262,7 @@ void PrecisionConverter::visit(Block &block) void PrecisionConverter::visit(Precision &prec) { - if(stage->required_features.gl_api==OPENGL_ES2) + if(stage->required_features.target_api==OPENGL_ES) have_default.insert(prec.type); else nodes_to_remove.insert(&prec); @@ -41,7 +270,7 @@ void PrecisionConverter::visit(Precision &prec) void PrecisionConverter::visit(VariableDeclaration &var) { - if(stage->required_features.gl_api!=OPENGL_ES2) + if(stage->required_features.target_api!=OPENGL_ES) { var.precision.clear(); return; @@ -80,27 +309,18 @@ void PrecisionConverter::visit(VariableDeclaration &var) } -LegacyConverter::LegacyConverter(): - frag_out(0) -{ } - -void LegacyConverter::apply(Stage &s, const Features &feat) +void FeatureConverter::apply(Stage &s, const Features &feat) { stage = &s; features = feat; - if(supports_stage(s.type)) - { - s.content.visit(*this); - NodeRemover().apply(s, nodes_to_remove); - if(!stage->required_features.glsl_version) - stage->required_features.glsl_version = Version(1, (stage->required_features.gl_api==OPENGL_ES2 ? 0 : 10)); - } - else - unsupported(format("Stage %s is not supported", Stage::get_stage_name(s.type))); + if(!stage->required_features.glsl_version) + stage->required_features.glsl_version = Version(1, (stage->required_features.target_api==OPENGL_ES ? 0 : 10)); + + apply(); } -void LegacyConverter::unsupported(const string &reason) +void FeatureConverter::unsupported(const string &reason) { Diagnostic diagnostic; diagnostic.severity = Diagnostic::ERR; @@ -110,17 +330,7 @@ void LegacyConverter::unsupported(const string &reason) stage->diagnostics.push_back(diagnostic); } -void LegacyConverter::visit(Block &block) -{ - for(NodeList::iterator i=block.body.begin(); i!=block.body.end(); ++i) - { - if(&block==&stage->content) - uniform_insert_point = i; - (*i)->visit(*this); - } -} - -bool LegacyConverter::check_version(const Version &feature_version) const +bool FeatureConverter::check_version(const Version &feature_version) const { if(features.glsl_versiontype)) + { + stage->content.visit(*this); + NodeRemover().apply(*stage, nodes_to_remove); + } + else + unsupported(format("Stage %s is not supported", Stage::get_stage_name(stage->type))); +} + +void StructuralFeatureConverter::visit(Block &block) +{ + for(auto i=block.body.begin(); i!=block.body.end(); ++i) + { + if(&block==&stage->content) + uniform_insert_point = i; + (*i)->visit(*this); + } +} + +void StructuralFeatureConverter::visit(RefPtr &expr) +{ + r_replaced_reference = 0; + expr->visit(*this); + if(r_replaced_reference) + expr = r_replaced_reference; + r_replaced_reference = 0; +} + +bool StructuralFeatureConverter::supports_stage(Stage::Type st) const { if(st==Stage::GEOMETRY) { - if(features.gl_api==OPENGL_ES2) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) return check_version(Version(3, 20)); else return check_version(Version(1, 50)); @@ -153,15 +396,17 @@ bool LegacyConverter::supports_stage(Stage::Type st) const return true; } -bool LegacyConverter::supports_unified_interface_syntax() const +bool StructuralFeatureConverter::supports_unified_interface_syntax() const { - if(features.gl_api==OPENGL_ES2) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) return check_version(Version(3, 0)); else return check_version(Version(1, 30)); } -void LegacyConverter::visit(VariableReference &var) +void StructuralFeatureConverter::visit(VariableReference &var) { if(var.declaration==frag_out && !supports_unified_interface_syntax()) { @@ -170,22 +415,41 @@ void LegacyConverter::visit(VariableReference &var) } } -void LegacyConverter::visit(Assignment &assign) +void StructuralFeatureConverter::visit(InterfaceBlockReference &iface) +{ + r_flattened_interface = nodes_to_remove.count(iface.declaration); +} + +void StructuralFeatureConverter::visit(MemberAccess &memacc) +{ + r_flattened_interface = false; + visit(memacc.left); + if(r_flattened_interface) + { + VariableReference *var = new VariableReference; + var->name = memacc.member; + r_replaced_reference = var; + } +} + +void StructuralFeatureConverter::visit(Assignment &assign) { TraversingVisitor::visit(assign); if(assign.target.declaration==frag_out && !supports_unified_interface_syntax()) assign.target.declaration = 0; } -bool LegacyConverter::supports_unified_sampling_functions() const +bool StructuralFeatureConverter::supports_unified_sampling_functions() const { - if(features.gl_api==OPENGL_ES2) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) return check_version(Version(3, 0)); else return check_version(Version(1, 30)); } -void LegacyConverter::visit(FunctionCall &call) +void StructuralFeatureConverter::visit(FunctionCall &call) { if(call.declaration && call.declaration->source==BUILTIN_SOURCE) { @@ -222,19 +486,97 @@ void LegacyConverter::visit(FunctionCall &call) TraversingVisitor::visit(call); } -bool LegacyConverter::supports_interface_layouts() const +void StructuralFeatureConverter::visit(VariableDeclaration &var) +{ + if((var.interface=="in" || var.interface=="out") && !supports_unified_interface_syntax()) + if(stage->type==Stage::FRAGMENT && var.interface=="out") + { + frag_out = &var; + nodes_to_remove.insert(&var); + } + + TraversingVisitor::visit(var); +} + +bool StructuralFeatureConverter::supports_interface_blocks(const string &iface) const { - if(features.gl_api==OPENGL_ES2) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) + { + if(iface=="uniform") + return check_version(Version(3, 0)); + else + return check_version(Version(3, 20)); + } + else if(check_version(Version(1, 50))) + return true; + else if(iface=="uniform") + return check_extension(&Features::arb_uniform_buffer_object); + else + return false; +} + +void StructuralFeatureConverter::visit(InterfaceBlock &iface) +{ + bool push_constant = has_layout_qualifier(iface.layout.get(), "push_constant"); + if((!supports_interface_blocks(iface.interface) || (push_constant && features.target_api!=VULKAN)) && iface.type_declaration) + { + if(!iface.instance_name.empty()) + unsupported("ARB_uniform_buffer_object required for interface block instances"); + else if(iface.struct_declaration) + { + for(const RefPtr &s: iface.struct_declaration->members.body) + if(VariableDeclaration *var = dynamic_cast(s.get())) + var->interface = iface.interface; + stage->content.body.splice(uniform_insert_point, iface.struct_declaration->members.body); + nodes_to_remove.insert(&iface); + nodes_to_remove.insert(iface.struct_declaration); + } + else + /* If the interface block is an array, it should have an instance + name too, so this should never be reached */ + throw logic_error("Unexpected interface block configuration"); + } +} + + +void QualifierConverter::apply() +{ + stage->content.visit(*this); +} + +bool QualifierConverter::supports_interface_layouts() const +{ + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) return check_version(Version(3, 0)); else if(check_version(Version(3, 30))) return true; - else + else if(check_version(Version(1, 30))) return check_extension(&Features::arb_explicit_attrib_location); + else + return false; +} + +bool QualifierConverter::supports_stage_interface_layouts() const +{ + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) + return check_version(Version(3, 10)); + else if(check_version(Version(4, 10))) + return true; + else + return check_extension(&Features::arb_separate_shader_objects); } -bool LegacyConverter::supports_centroid_sampling() const +bool QualifierConverter::supports_centroid_sampling() const { - if(features.gl_api==OPENGL_ES2) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) return check_version(Version(3, 0)); else if(check_version(Version(1, 20))) return true; @@ -242,9 +584,11 @@ bool LegacyConverter::supports_centroid_sampling() const return check_extension(&Features::ext_gpu_shader4); } -bool LegacyConverter::supports_sample_sampling() const +bool QualifierConverter::supports_sample_sampling() const { - if(features.gl_api==OPENGL_ES2) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) return check_version(Version(3, 20)); else if(check_version(Version(4, 0))) return true; @@ -252,23 +596,70 @@ bool LegacyConverter::supports_sample_sampling() const return check_extension(&Features::arb_gpu_shader5); } -void LegacyConverter::visit(VariableDeclaration &var) +bool QualifierConverter::supports_uniform_location() const +{ + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) + return check_version(Version(3, 10)); + else if(check_version(Version(4, 30))) + return true; + else + return check_extension(&Features::arb_explicit_uniform_location); +} + +bool QualifierConverter::supports_binding() const +{ + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) + return check_version(Version(3, 10)); + else + return check_version(Version(4, 20)); +} + +void QualifierConverter::visit(VariableDeclaration &var) { if(var.layout) { - for(vector::const_iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ) + for(auto i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ) { - if(i->name=="location" && !supports_interface_layouts()) + if(i->name=="location") { - if(stage->type==Stage::VERTEX && var.interface=="in") - stage->locations[var.name] = i->value; - else if(stage->type==Stage::FRAGMENT && var.interface=="out") + bool supported = true; + bool external = false; + if(var.interface=="in") { - if(check_extension(&Features::ext_gpu_shader4)) + external = (stage->type==Stage::VERTEX); + supported = (external ? supports_interface_layouts() : supports_stage_interface_layouts()); + } + else if(var.interface=="out") + { + external = (stage->type==Stage::FRAGMENT); + supported = (external ? supports_interface_layouts() : supports_stage_interface_layouts()); + if(external && !supported && !check_extension(&Features::ext_gpu_shader4)) + { + external = false; + if(i->value!=0) + unsupported("EXT_gpu_shader4 required for multiple fragment shader outputs"); + } + } + else if(var.interface=="uniform") + supported = supports_uniform_location(); + + if(!supported) + { + if(external) stage->locations[var.name] = i->value; - else if(i->value!=0) - unsupported("EXT_gpu_shader4 required for multiple fragment shader outputs"); + i = var.layout->qualifiers.erase(i); } + else + ++i; + } + else if(i->name=="binding" && !supports_binding()) + { + if(dynamic_cast(get_ultimate_base_type(var.type_declaration))) + stage->texture_bindings[var.name] = i->value; i = var.layout->qualifiers.erase(i); } @@ -291,51 +682,44 @@ void LegacyConverter::visit(VariableDeclaration &var) var.sampling = string(); } - if((var.interface=="in" || var.interface=="out") && !supports_unified_interface_syntax()) - { - if(stage->type==Stage::FRAGMENT && var.interface=="out") - { - frag_out = &var; - nodes_to_remove.insert(&var); - } - } + if(var.name=="gl_ClipDistance") + if(const Literal *literal_size = dynamic_cast(var.array_size.get())) + stage->n_clip_distances = literal_size->value.value(); TraversingVisitor::visit(var); } -bool LegacyConverter::supports_interface_blocks(const string &iface) const +bool QualifierConverter::supports_interface_block_location() const { - if(features.gl_api==OPENGL_ES2) - { - if(iface=="uniform") - return check_version(Version(3, 0)); - else - return check_version(Version(3, 20)); - } - else if(check_version(Version(1, 50))) + if(features.target_api==VULKAN) + return true; + else if(features.target_api==OPENGL_ES) + return check_version(Version(3, 20)); + else if(check_version(Version(4, 40))) return true; - else if(iface=="uniform") - return check_extension(&Features::arb_uniform_buffer_object); else - return false; + return check_extension(&Features::arb_enhanced_layouts); } -void LegacyConverter::visit(InterfaceBlock &iface) +void QualifierConverter::visit(InterfaceBlock &iface) { - if(!supports_interface_blocks(iface.interface) && iface.type_declaration) + if(iface.layout) { - if(!iface.instance_name.empty()) - unsupported("ARB_uniform_buffer_object required for interface block instances"); - else if(iface.struct_declaration) + for(auto i=iface.layout->qualifiers.begin(); i!=iface.layout->qualifiers.end(); ) { - stage->content.body.splice(uniform_insert_point, iface.struct_declaration->members.body); - nodes_to_remove.insert(&iface); - nodes_to_remove.insert(iface.struct_declaration); + if(i->name=="location" && !supports_interface_block_location()) + i = iface.layout->qualifiers.erase(i); + else if(i->name=="binding" && !supports_binding()) + { + stage->uniform_block_bindings[iface.block_name] = i->value; + i = iface.layout->qualifiers.erase(i); + } + else + ++i; } - else - /* If the interface block is an array, it should have an instance - name too, so this should never be reached */ - throw logic_error("Unexpected interface block configuration"); + + if(iface.layout->qualifiers.empty()) + iface.layout = 0; } }