namespace GL {
namespace SL {
-DeclarationCombiner::DeclarationCombiner():
- toplevel(true)
-{ }
-
void DeclarationCombiner::apply(Stage &stage)
{
- visit(stage.content);
+ stage.content.visit(*this);
NodeRemover().apply(stage, nodes_to_remove);
}
void DeclarationCombiner::visit(Block &block)
{
- if(!toplevel)
+ if(current_block)
return;
- SetForScope<bool> set(toplevel, false);
TraversingVisitor::visit(block);
}
{
bool found = false;
for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
- if(j->identifier==i->identifier)
+ if(j->name==i->name)
{
+ j->has_value = i->value;
j->value = i->value;
found = true;
}
}
+void BlockResolver::enter(Block &block)
+{
+ block.parent = current_block;
+}
+
+void BlockResolver::visit(InterfaceBlock &iface)
+{
+ iface.members.anonymous = true;
+ TraversingVisitor::visit(iface);
+}
+
+
VariableResolver::VariableResolver():
- anonymous(false),
record_target(false),
assignment_target(0),
self_referencing(false)
void VariableResolver::apply(Stage &stage)
{
- Stage *builtins = get_builtins(stage.type);
- if(builtins)
- blocks.push_back(&builtins->content);
- visit(stage.content);
- if(builtins)
- blocks.pop_back();
+ Stage *builtin_stage = get_builtins(stage.type);
+ builtins = (builtin_stage ? &builtin_stage->content : 0);
+ stage.content.visit(*this);
}
-void VariableResolver::visit(Block &block)
+Block *VariableResolver::next_block(Block &block)
{
- if(!blocks.empty() && blocks.back()==&block)
- return TraversingVisitor::visit(block);
+ return block.parent ? block.parent : &block!=builtins ? builtins : 0;
+}
- blocks.push_back(&block);
+void VariableResolver::enter(Block &block)
+{
block.variables.clear();
- TraversingVisitor::visit(block);
- blocks.pop_back();
}
void VariableResolver::visit(VariableReference &var)
{
var.declaration = 0;
type = 0;
- for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+ for(Block *block=current_block; block; block=next_block(*block))
{
- --i;
- map<string, VariableDeclaration *>::iterator j = (*i)->variables.find(var.name);
- if(j!=(*i)->variables.end())
+ map<string, VariableDeclaration *>::iterator j = block->variables.find(var.name);
+ if(j!=block->variables.end())
{
var.declaration = j->second;
type = j->second->type_declaration;
void VariableResolver::visit(StructDeclaration &strct)
{
TraversingVisitor::visit(strct);
- blocks.back()->types[strct.name] = &strct;
+ current_block->types[strct.name] = &strct;
}
void VariableResolver::visit(VariableDeclaration &var)
{
- for(vector<Block *>::iterator i=blocks.end(); i!=blocks.begin(); )
+ for(Block *block=current_block; block; block=next_block(*block))
{
- --i;
- map<string, StructDeclaration *>::iterator j = (*i)->types.find(var.type);
- if(j!=(*i)->types.end())
+ map<string, StructDeclaration *>::iterator j = block->types.find(var.type);
+ if(j!=block->types.end())
var.type_declaration = j->second;
}
var.interface = block_interface;
TraversingVisitor::visit(var);
- blocks.back()->variables[var.name] = &var;
- if(anonymous && blocks.size()>1)
- blocks[blocks.size()-2]->variables[var.name] = &var;
+ current_block->variables[var.name] = &var;
+ if(current_block->anonymous && current_block->parent)
+ current_block->parent->variables[var.name] = &var;
}
void VariableResolver::visit(InterfaceBlock &iface)
{
- SetFlag set(anonymous);
- SetForScope<string> set2(block_interface, iface.interface);
+ SetForScope<string> set_iface(block_interface, iface.interface);
TraversingVisitor::visit(iface);
}
-void VariableResolver::visit(FunctionDeclaration &func)
-{
- blocks.push_back(&func.body);
- func.body.variables.clear();
- TraversingVisitor::visit(func);
- blocks.pop_back();
-}
-
-void VariableResolver::visit(Iteration &iter)
-{
- blocks.push_back(&iter.body);
- iter.body.variables.clear();
- TraversingVisitor::visit(iter);
- blocks.pop_back();
-}
-
void FunctionResolver::visit(FunctionCall &call)
{
InterfaceGenerator::InterfaceGenerator():
- stage(0),
- scope_level(0),
- current_block(0)
+ stage(0)
{ }
string InterfaceGenerator::get_out_prefix(Stage::Type type)
if(stage->previous)
in_prefix = get_out_prefix(stage->previous->type);
out_prefix = get_out_prefix(stage->type);
- visit(s.content);
+ s.content.visit(*this);
NodeRemover().apply(s, nodes_to_remove);
}
void InterfaceGenerator::visit(Block &block)
{
- SetForScope<unsigned> set(scope_level, scope_level+1);
SetForScope<Block *> set_block(current_block, &block);
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
assignment_insert_point = i;
- if(scope_level==1)
+ if(&block==&stage->content)
iface_insert_point = i;
(*i)->visit(*this);
iface_var->linked_declaration = &var;
stage->content.body.insert(iface_insert_point, iface_var);
{
- SetForScope<unsigned> set_level(scope_level, 1);
SetForScope<Block *> set_block(current_block, &stage->content);
iface_var->visit(*this);
}
{
if(var.declaration || !stage->previous)
return;
+ /* Don't pull a variable from previous stage if we just generated an out
+ interface in this stage */
+ if(stage->out_variables.count(var.name))
+ return;
const map<string, VariableDeclaration *> &prev_out = stage->previous->out_variables;
map<string, VariableDeclaration *>::const_iterator i = prev_out.find(var.name);
{
if(var.interface=="out")
{
- if(scope_level==1)
+ if(current_block==&stage->content)
stage->out_variables[var.name] = &var;
else if(generate_interface(var, "out", change_prefix(var.name, string())))
{
TraversingVisitor::visit(var);
}
+void InterfaceGenerator::visit(FunctionDeclaration &func)
+{
+ // Skip parameters because they're not useful here
+ func.body.visit(*this);
+}
+
void InterfaceGenerator::visit(Passthrough &pass)
{
vector<VariableDeclaration *> pass_vars;
DeclarationReorderer::DeclarationReorderer():
- scope_level(0),
kind(NO_DECLARATION)
{ }
void DeclarationReorderer::visit(Block &block)
{
- SetForScope<unsigned> set(scope_level, scope_level+1);
- if(scope_level>1)
+ if(block.parent)
return TraversingVisitor::visit(block);
NodeList<Statement>::iterator struct_insert_point = block.body.end();
projects / libs / gl.git / blobdiff