namespace GL {
namespace SL {
-StructOrganizer::StructOrganizer():
- offset(-1)
-{ }
-
void StructOrganizer::visit(StructDeclaration &strct)
{
SetForScope<int> set_offset(offset, 0);
bool has_matrix_order = false;
if(var.layout)
{
- vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
- for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
+ for(Layout::Qualifier &q: var.layout->qualifiers)
{
- if(i->name=="offset" && i->has_value)
+ if(q.name=="offset" && q.has_value)
{
- layout_offset = &i->value;
- if(i->value>=offset)
- offset = i->value;
+ layout_offset = &q.value;
+ if(q.value>=offset)
+ offset = q.value;
}
- else if(i->name=="column_major" || i->name=="row_major")
+ else if(q.name=="column_major" || q.name=="row_major")
has_matrix_order = true;
}
}
void LocationAllocator::apply(Module &module, const Features &features)
{
- for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)
- apply(*i);
+ for(Stage &s: module.stages)
+ apply(s);
allocate_locations("uniform");
- for(vector<InterfaceBlock *>::const_iterator i=unbound_blocks.begin(); i!=unbound_blocks.end(); ++i)
- bind_uniform((*i)->layout, (*i)->block_name, features.uniform_binding_range);
- for(vector<VariableDeclaration *>::const_iterator i=unbound_textures.begin(); i!=unbound_textures.end(); ++i)
- bind_uniform((*i)->layout, (*i)->name, features.texture_binding_range);
+ 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)
void LocationAllocator::allocate_locations(const string &iface)
{
- vector<VariableDeclaration *>::iterator write = unplaced_variables.begin();
+ auto write = unplaced_variables.begin();
unsigned next = 0;
- for(vector<VariableDeclaration *>::const_iterator i=unplaced_variables.begin(); i!=unplaced_variables.end(); ++i)
+ for(auto i=unplaced_variables.begin(); i!=unplaced_variables.end(); ++i)
{
if((*i)->interface!=iface)
{
if((*i)->interface=="uniform")
{
- map<string, Uniform>::const_iterator j = uniforms.find((*i)->name);
+ auto j = uniforms.find((*i)->name);
if(j!=uniforms.end() && j->second.location>=0)
{
add_layout_value((*i)->layout, "location", j->second.location);
void LocationAllocator::bind_uniform(RefPtr<Layout> &layout, const string &name, unsigned range)
{
- map<string, Uniform>::const_iterator i = uniforms.find(name);
+ auto i = uniforms.find(name);
if(i!=uniforms.end() && i->second.bind_point>=0)
add_layout_value(layout, "binding", i->second.bind_point);
else
if(iface.interface=="uniform")
{
- int bind_point = (iface.layout ? get_layout_value(*iface.layout, "binding") : -1);
+ bool push_constant = false;
+ if(iface.layout)
+ {
+ auto i = find_member(iface.layout->qualifiers, string("push_constant"), &Layout::Qualifier::name);
+ push_constant = (i!=iface.layout->qualifiers.end());
+ }
- if(bind_point>=0)
+ if(!push_constant)
{
- used_bindings[0].insert(bind_point);
- uniforms[iface.block_name].bind_point = bind_point;
+ int bind_point = (iface.layout ? get_layout_value(*iface.layout, "binding") : -1);
+
+ if(bind_point>=0)
+ {
+ used_bindings[0].insert(bind_point);
+ uniforms[iface.block_name].bind_point = bind_point;
+ }
+ else
+ unbound_blocks.push_back(&iface);
}
- else
- unbound_blocks.push_back(&iface);
}
}
-PrecisionConverter::PrecisionConverter():
- stage(0)
-{ }
-
void PrecisionConverter::apply(Stage &s)
{
stage = &s;
void PrecisionConverter::visit(Block &block)
{
- for(NodeList<Statement>::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;
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);
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;
}
-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;
stage->diagnostics.push_back(diagnostic);
}
-void LegacyConverter::visit(Block &block)
-{
- for(NodeList<Statement>::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_version<feature_version)
return false;
return true;
}
-bool LegacyConverter::check_extension(bool Features::*extension) const
+bool FeatureConverter::check_extension(bool Features::*extension) const
{
if(!(features.*extension))
return false;
return true;
}
-bool LegacyConverter::supports_stage(Stage::Type st) const
+
+void StructuralFeatureConverter::apply()
+{
+ if(supports_stage(stage->type))
+ {
+ 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<Expression> &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==OPENGL_ES)
return check_version(Version(3, 20));
else
return check_version(Version(1, 50));
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==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())
{
}
}
-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==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)
{
TraversingVisitor::visit(call);
}
-bool LegacyConverter::supports_interface_layouts() const
+void StructuralFeatureConverter::visit(VariableDeclaration &var)
{
- if(features.gl_api==OPENGL_ES2)
+ 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.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 = false;
+ if(iface.layout)
+ {
+ auto i = find_member(iface.layout->qualifiers, string("push_constant"), &Layout::Qualifier::name);
+ push_constant = (i!=iface.layout->qualifiers.end());
+ }
+
+ if((!supports_interface_blocks(iface.interface) || push_constant) && 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<Statement> &s: iface.struct_declaration->members.body)
+ if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(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==OPENGL_ES)
return check_version(Version(3, 0));
else if(check_version(Version(3, 30)))
return true;
return false;
}
-bool LegacyConverter::supports_stage_interface_layouts() const
+bool QualifierConverter::supports_stage_interface_layouts() const
{
- if(features.gl_api==OPENGL_ES2)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 10));
else if(check_version(Version(4, 10)))
return true;
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==OPENGL_ES)
return check_version(Version(3, 0));
else if(check_version(Version(1, 20)))
return true;
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==OPENGL_ES)
return check_version(Version(3, 20));
else if(check_version(Version(4, 0)))
return true;
return check_extension(&Features::arb_gpu_shader5);
}
-bool LegacyConverter::supports_uniform_location() const
+bool QualifierConverter::supports_uniform_location() const
{
- if(features.gl_api==OPENGL_ES2)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 10));
else if(check_version(Version(4, 30)))
return true;
return check_extension(&Features::arb_explicit_uniform_location);
}
-bool LegacyConverter::supports_binding() const
+bool QualifierConverter::supports_binding() const
{
- if(features.gl_api==OPENGL_ES2)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 10));
else
return check_version(Version(4, 20));
}
-void LegacyConverter::visit(VariableDeclaration &var)
+void QualifierConverter::visit(VariableDeclaration &var)
{
if(var.layout)
{
- for(vector<Layout::Qualifier>::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")
{
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<const Literal *>(var.array_size.get()))
+ stage->n_clip_distances = literal_size->value.value<int>();
TraversingVisitor::visit(var);
}
-bool LegacyConverter::supports_interface_blocks(const string &iface) 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)))
- return true;
- else if(iface=="uniform")
- return check_extension(&Features::arb_uniform_buffer_object);
- else
- return false;
-}
-
-bool LegacyConverter::supports_interface_block_location() const
+bool QualifierConverter::supports_interface_block_location() const
{
- if(features.gl_api==OPENGL_ES2)
+ if(features.target_api==OPENGL_ES)
return check_version(Version(3, 20));
else if(check_version(Version(4, 40)))
return true;
return check_extension(&Features::arb_enhanced_layouts);
}
-void LegacyConverter::visit(InterfaceBlock &iface)
+void QualifierConverter::visit(InterfaceBlock &iface)
{
if(iface.layout)
{
- for(vector<Layout::Qualifier>::const_iterator i=iface.layout->qualifiers.begin(); i!=iface.layout->qualifiers.end(); )
+ for(auto i=iface.layout->qualifiers.begin(); i!=iface.layout->qualifiers.end(); )
{
if(i->name=="location" && !supports_interface_block_location())
i = iface.layout->qualifiers.erase(i);
if(iface.layout->qualifiers.empty())
iface.layout = 0;
}
-
- if(!supports_interface_blocks(iface.interface) && iface.type_declaration)
- {
- if(!iface.instance_name.empty())
- unsupported("ARB_uniform_buffer_object required for interface block instances");
- else if(iface.struct_declaration)
- {
- 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");
- }
}
} // namespace SL