+#include <msp/core/algorithm.h>
#include <msp/core/raii.h>
#include <msp/strings/format.h>
#include <msp/strings/utils.h>
if(var.layout)
{
vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
- for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); (!specializable && i!=qualifiers.end()); ++i)
- if(i->name=="constant_id")
- {
- specializable = true;
- qualifiers.erase(i);
- }
-
- if(qualifiers.empty())
- var.layout = 0;
+ auto i = find_member(qualifiers, string("constant_id"), &Layout::Qualifier::name);
+ if(i!=qualifiers.end())
+ {
+ specializable = true;
+ qualifiers.erase(i);
+ if(qualifiers.empty())
+ var.layout = 0;
+ }
}
if(specializable)
{
- map<string, int>::const_iterator i = values->find(var.name);
+ auto i = values->find(var.name);
if(i!=values->end())
{
RefPtr<Literal> literal = new Literal;
void InlineableFunctionLocator::visit(FunctionDeclaration &func)
{
- bool has_out_params = false;
- for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); (!has_out_params && i!=func.parameters.end()); ++i)
- has_out_params = ((*i)->interface=="out");
+ bool has_out_params = any_of(func.parameters.begin(), func.parameters.end(),
+ [](const RefPtr<VariableDeclaration> &p){ return p->interface=="out"; });
unsigned &count = refcounts[func.definition];
if((count<=1 || func.source==BUILTIN_SOURCE) && !has_out_params)
vector<RefPtr<VariableDeclaration> > params;
params.reserve(source_func->parameters.size());
- for(NodeArray<VariableDeclaration>::iterator i=source_func->parameters.begin(); i!=source_func->parameters.end(); ++i)
+ for(const RefPtr<VariableDeclaration> &p: source_func->parameters)
{
- RefPtr<VariableDeclaration> var = (*i)->clone();
+ RefPtr<VariableDeclaration> var = p->clone();
var->interface.clear();
SetForScope<Pass> set_pass(pass, RENAME);
params.push_back(var);
}
- for(NodeList<Statement>::iterator i=source_func->body.body.begin(); i!=source_func->body.body.end(); ++i)
+ for(const RefPtr<Statement> &s: source_func->body.body)
{
r_inlined_statement = 0;
- (*i)->visit(*this);
+ s->visit(*this);
if(!r_inlined_statement)
- r_inlined_statement = (*i)->clone();
+ r_inlined_statement = s->clone();
SetForScope<Pass> set_pass(pass, RENAME);
r_inlined_statement->visit(*this);
{
if(pass==RENAME)
{
- map<string, VariableDeclaration *>::const_iterator i = staging_block.variables.find(var.name);
+ auto i = staging_block.variables.find(var.name);
if(i!=staging_block.variables.end())
var.name = i->second->name;
}
{
SetForScope<Block *> set_block(current_block, &block);
SetForScope<NodeList<Statement>::iterator> save_insert_point(insert_point, block.body.begin());
- for(NodeList<Statement>::iterator i=block.body.begin(); (!r_inlined_here && i!=block.body.end()); ++i)
+ for(auto i=block.body.begin(); (!r_inlined_here && i!=block.body.end()); ++i)
{
insert_point = i;
(*i)->visit(*this);
void FunctionInliner::visit(FunctionCall &call)
{
- for(NodeArray<Expression>::iterator i=call.arguments.begin(); (!r_inlined_here && i!=call.arguments.end()); ++i)
+ for(auto i=call.arguments.begin(); (!r_inlined_here && i!=call.arguments.end()); ++i)
visit(*i);
if(r_inlined_here)
s.content.visit(*this);
bool any_inlined = false;
- for(list<ExpressionInfo>::iterator i=expressions.begin(); i!=expressions.end(); ++i)
- if(i->expression && (i->trivial || i->uses.size()==1))
+ for(ExpressionInfo &e: expressions)
+ if(e.expression && (e.trivial || e.uses.size()==1))
{
- for(vector<ExpressionUse>::iterator j=i->uses.begin(); j!=i->uses.end(); ++j)
- if(!j->blocked)
+ for(ExpressionUse &u: e.uses)
+ if(!u.blocked)
{
- *j->reference = i->expression->clone();
+ *u.reference = e.expression->clone();
any_inlined = true;
}
}
{
if(var.declaration && access_read)
{
- map<Assignment::Target, ExpressionInfo *>::iterator i = assignments.find(var.declaration);
+ auto i = assignments.find(var.declaration);
if(i!=assignments.end())
r_ref_info = i->second;
}
r_trivial = true;
visit(assign.right);
- map<Assignment::Target, ExpressionInfo *>::iterator i = assignments.find(assign.target);
+ auto i = assignments.find(assign.target);
if(i!=assignments.end())
{
if(iteration_body && i->second->expression)
/* Block inlining into previous references within the iteration
statement. On iterations after the first they would refer to the
assignment within the iteration. */
- for(vector<ExpressionUse>::iterator j=i->second->uses.begin(); j!=i->second->uses.end(); ++j)
- for(Block *k=j->ref_scope; (!j->blocked && k); k=k->parent)
- j->blocked = (k==iteration_body);
+ for(ExpressionUse &u: i->second->uses)
+ for(Block *k=u.ref_scope; (!u.blocked && k); k=k->parent)
+ u.blocked = (k==iteration_body);
}
expressions.push_back(ExpressionInfo());
bool constant = var.constant;
if(constant && var.layout)
{
- for(vector<Layout::Qualifier>::const_iterator i=var.layout->qualifiers.begin(); (constant && i!=var.layout->qualifiers.end()); ++i)
- constant = (i->name!="constant_id");
+ constant = !any_of(var.layout->qualifiers.begin(), var.layout->qualifiers.end(),
+ [](const Layout::Qualifier &q){ return q.name=="constant_id"; });
}
/* Only inline global variables if they're constant and have trivial
void ConstantConditionEliminator::visit(Block &block)
{
SetForScope<Block *> set_block(current_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)
{
insert_point = i;
(*i)->visit(*this);
void UnreachableCodeRemover::visit(Block &block)
{
- NodeList<Statement>::iterator i = block.body.begin();
+ auto i = block.body.begin();
for(; (reachable && i!=block.body.end()); ++i)
(*i)->visit(*this);
for(; i!=block.body.end(); ++i)
stage = &s;
s.content.visit(*this);
- for(list<AssignmentInfo>::const_iterator i=assignments.begin(); i!=assignments.end(); ++i)
- if(i->used_by.empty())
- unused_nodes.insert(i->node);
+ for(const AssignmentInfo &a: assignments)
+ if(a.used_by.empty())
+ unused_nodes.insert(a.node);
- for(BlockVariableMap::const_iterator i=variables.begin(); i!=variables.end(); ++i)
+ for(const auto &kvp: variables)
{
- if(i->second.output)
+ if(kvp.second.output)
{
/* The last visible assignments of output variables are used by the
next stage or the API. */
- for(vector<AssignmentInfo *>::const_iterator j=i->second.assignments.begin(); j!=i->second.assignments.end(); ++j)
- unused_nodes.erase((*j)->node);
+ for(AssignmentInfo *a: kvp.second.assignments)
+ unused_nodes.erase(a->node);
}
- if(!i->second.output && !i->second.referenced)
+ if(!kvp.second.output && !kvp.second.referenced)
{
// Don't remove variables from inside interface blocks.
- if(!i->second.interface_block)
- unused_nodes.insert(i->first);
+ if(!kvp.second.interface_block)
+ unused_nodes.insert(kvp.first);
}
- else if(i->second.interface_block)
+ else if(kvp.second.interface_block)
// Interface blocks are kept if even one member is used.
- unused_nodes.erase(i->second.interface_block);
+ unused_nodes.erase(kvp.second.interface_block);
}
NodeRemover().apply(s, unused_nodes);
if(!assignment_target)
{
bool loop_external = false;
- for(vector<AssignmentInfo *>::const_iterator i=var_info.assignments.begin(); i!=var_info.assignments.end(); ++i)
+ for(AssignmentInfo *a: var_info.assignments)
{
bool covered = true;
- for(unsigned j=0; (covered && j<(*i)->target.chain_len && j<target.chain_len); ++j)
+ for(unsigned j=0; (covered && j<a->target.chain_len && j<target.chain_len); ++j)
{
- Assignment::Target::ChainType type1 = static_cast<Assignment::Target::ChainType>((*i)->target.chain[j]&0xC0);
+ Assignment::Target::ChainType type1 = static_cast<Assignment::Target::ChainType>(a->target.chain[j]&0xC0);
Assignment::Target::ChainType type2 = static_cast<Assignment::Target::ChainType>(target.chain[j]&0xC0);
if(type1==Assignment::Target::SWIZZLE || type2==Assignment::Target::SWIZZLE)
{
- unsigned index1 = (*i)->target.chain[j]&0x3F;
+ unsigned index1 = a->target.chain[j]&0x3F;
unsigned index2 = target.chain[j]&0x3F;
if(type1==Assignment::Target::SWIZZLE && type2==Assignment::Target::SWIZZLE)
covered = index1&index2;
covered as true */
}
else
- covered = ((*i)->target.chain[j]==target.chain[j]);
+ covered = (a->target.chain[j]==target.chain[j]);
}
if(covered)
{
- (*i)->used_by.push_back(&node);
- if((*i)->in_loop<in_loop)
+ a->used_by.push_back(&node);
+ if(a->in_loop<in_loop)
loop_external = true;
}
}
if(stage->type==Stage::GEOMETRY && call.name=="EmitVertex")
{
- for(map<Statement *, VariableInfo>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
- if(i->second.output)
- referenced(i->first, call);
+ for(const auto &kvp: variables)
+ if(kvp.second.output)
+ referenced(kvp.first, call);
}
}
void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)
{
- for(BlockVariableMap::const_iterator i=other_vars.begin(); i!=other_vars.end(); ++i)
+ for(const auto &kvp: other_vars)
{
- BlockVariableMap::iterator j = variables.find(i->first);
+ auto j = variables.find(kvp.first);
if(j!=variables.end())
{
/* The merged blocks started as copies of each other so any common
assignments must be in the beginning. */
unsigned k = 0;
- for(; (k<i->second.assignments.size() && k<j->second.assignments.size()); ++k)
- if(i->second.assignments[k]!=j->second.assignments[k])
+ for(; (k<kvp.second.assignments.size() && k<j->second.assignments.size()); ++k)
+ if(kvp.second.assignments[k]!=j->second.assignments[k])
break;
// Remaining assignments are unique to each block; merge them.
- j->second.assignments.insert(j->second.assignments.end(), i->second.assignments.begin()+k, i->second.assignments.end());
- j->second.referenced |= i->second.referenced;
+ j->second.assignments.insert(j->second.assignments.end(), kvp.second.assignments.begin()+k, kvp.second.assignments.end());
+ j->second.referenced |= kvp.second.referenced;
}
else
- variables.insert(*i);
+ variables.insert(kvp);
}
}
BlockVariableMap saved_vars = variables;
// Assignments from other functions should not be visible.
- for(BlockVariableMap::iterator i=variables.begin(); i!=variables.end(); ++i)
- i->second.assignments.resize(i->second.initialized);
+ for(auto &kvp: variables)
+ kvp.second.assignments.resize(kvp.second.initialized);
TraversingVisitor::visit(func);
swap(variables, saved_vars);
merge_variables(saved_vars);
/* Always treat function parameters as referenced. Removing unused
parameters is not currently supported. */
- for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+ for(const RefPtr<VariableDeclaration> &p: func.parameters)
{
- BlockVariableMap::iterator j = variables.find(i->get());
+ auto j = variables.find(p.get());
if(j!=variables.end())
j->second.referenced = true;
}
/* Visit the external references of the loop again to record assignments
done in the loop as used. */
- for(vector<Node *>::const_iterator i=saved_refs.begin(); i!=saved_refs.end(); ++i)
- (*i)->visit(*this);
+ for(Node *n: saved_refs)
+ n->visit(*this);
/* Merge assignments from the iteration, without clearing previous state.
Further analysis is needed to determine which parts of the iteration body
projects / libs / gl.git / blobdiff