StructDeclaration *strct = new StructDeclaration;
strct->source = INTERNAL_SOURCE;
- strct->name = format("_%s_%s", iface.interface, iface.name);
+ strct->name = format("_%s_%s", iface.interface, iface.block_name);
strct->members.body.splice(strct->members.body.begin(), iface.members->body);
stage->content.body.insert(type_insert_point, strct);
stage->types.insert(make_pair(strct->name, strct));
s.interface_blocks.clear();
r_any_resolved = false;
s.content.visit(*this);
+ for(vector<VariableDeclaration *>::const_iterator i=redeclared_builtins.begin(); i!=redeclared_builtins.end(); ++i)
+ (*i)->source = GENERATED_SOURCE;
NodeRemover().apply(s, nodes_to_remove);
return r_any_resolved;
}
ptr = &var;
else if(!current_block->parent && ptr->interface==var.interface && ptr->type==var.type)
{
+ if(ptr->source==BUILTIN_SOURCE)
+ redeclared_builtins.push_back(&var);
+ else
+ stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+ format("Redeclaring non-builtin variable '%s' is deprecated", var.name)));
+
if(var.init_expression)
ptr->init_expression = var.init_expression;
if(var.layout)
{
/* Block names can be reused in different interfaces. Prefix the name with
the first character of the interface to avoid conflicts. */
- stage->interface_blocks.insert(make_pair(iface.interface+iface.name, &iface));
+ stage->interface_blocks.insert(make_pair(iface.interface+iface.block_name, &iface));
if(!iface.instance_name.empty())
stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface));
RefPtr<FunctionCall> call = new FunctionCall;
call->name = type.name;
call->constructor = true;
- call->arguments.push_back(0);
- call->arguments.back() = expr;
+ call->arguments.push_back_nocopy(expr);
call->type = &type;
expr = call;
}
return false;
}
+bool ExpressionResolver::truncate_vector(RefPtr<Expression> &expr, unsigned size)
+{
+ if(BasicTypeDeclaration *expr_basic = dynamic_cast<BasicTypeDeclaration *>(expr->type))
+ if(BasicTypeDeclaration *expr_elem = get_element_type(*expr_basic))
+ {
+ RefPtr<Swizzle> swizzle = new Swizzle;
+ swizzle->left = expr;
+ swizzle->oper = &Operator::get_operator(".", Operator::POSTFIX);
+ swizzle->component_group = string("xyzw", size);
+ swizzle->count = size;
+ for(unsigned i=0; i<size; ++i)
+ swizzle->components[i] = i;
+ if(size==1)
+ swizzle->type = expr_elem;
+ else
+ swizzle->type = find_type(*expr_elem, BasicTypeDeclaration::VECTOR, size);
+ expr = swizzle;
+
+ return true;
+ }
+
+ return false;
+}
+
void ExpressionResolver::resolve(Expression &expr, TypeDeclaration *type, bool lvalue)
{
r_any_resolved |= (type!=expr.type || lvalue!=expr.lvalue);
expr.lvalue = lvalue;
}
+void ExpressionResolver::visit(Block &block)
+{
+ SetForScope<Block *> set_block(current_block, &block);
+ for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+ {
+ insert_point = i;
+ (*i)->visit(*this);
+ }
+}
+
void ExpressionResolver::visit(Literal &literal)
{
if(literal.value.check_type<bool>())
resolve(literal, find_type(BasicTypeDeclaration::FLOAT, 32), false);
}
-void ExpressionResolver::visit(ParenthesizedExpression &parexpr)
-{
- TraversingVisitor::visit(parexpr);
- resolve(parexpr, parexpr.expression->type, parexpr.expression->lvalue);
-}
-
void ExpressionResolver::visit(VariableReference &var)
{
if(var.declaration)
{
BasicTypeDeclaration *basic_true = dynamic_cast<BasicTypeDeclaration *>(ternary.true_expr->type);
BasicTypeDeclaration *basic_false = dynamic_cast<BasicTypeDeclaration *>(ternary.false_expr->type);
+ if(!basic_true || !basic_false)
+ return;
+
Compatibility compat = get_compatibility(*basic_true, *basic_false);
if(compat==NOT_COMPATIBLE)
return;
resolve(ternary, type, false);
}
+void ExpressionResolver::visit_constructor(FunctionCall &call)
+{
+ if(call.arguments.empty())
+ return;
+
+ map<string, TypeDeclaration *>::const_iterator i = stage->types.find(call.name);
+ if(i==stage->types.end())
+ return;
+ else if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(i->second))
+ {
+ BasicTypeDeclaration *elem = get_element_type(*basic);
+ if(!elem)
+ return;
+
+ vector<ArgumentInfo> args;
+ args.reserve(call.arguments.size());
+ unsigned arg_component_total = 0;
+ bool has_matrices = false;
+ for(NodeArray<Expression>::const_iterator j=call.arguments.begin(); j!=call.arguments.end(); ++j)
+ {
+ ArgumentInfo info;
+ if(!(info.type=dynamic_cast<BasicTypeDeclaration *>((*j)->type)))
+ return;
+ if(is_scalar(*info.type) || info.type->kind==BasicTypeDeclaration::BOOL)
+ info.component_count = 1;
+ else if(info.type->kind==BasicTypeDeclaration::VECTOR)
+ info.component_count = info.type->size;
+ else if(info.type->kind==BasicTypeDeclaration::MATRIX)
+ {
+ info.component_count = (info.type->size>>16)*(info.type->size&0xFFFF);
+ has_matrices = true;
+ }
+ else
+ return;
+ arg_component_total += info.component_count;
+ args.push_back(info);
+ }
+
+ bool convert_args = false;
+ if((is_scalar(*basic) || basic->kind==BasicTypeDeclaration::BOOL) && call.arguments.size()==1 && !has_matrices)
+ {
+ if(arg_component_total>1)
+ truncate_vector(call.arguments.front(), 1);
+
+ /* Single-element type constructors never need to convert their
+ arguments because the constructor *is* the conversion. */
+ }
+ else if(basic->kind==BasicTypeDeclaration::VECTOR && !has_matrices)
+ {
+ /* Vector constructors need either a single scalar argument or
+ enough components to fill out the vector. */
+ if(arg_component_total!=1 && arg_component_total<basic->size)
+ return;
+
+ /* A vector of same size can be converted directly. For other
+ combinations the individual arguments need to be converted. */
+ if(call.arguments.size()==1)
+ {
+ if(arg_component_total==1)
+ convert_args = true;
+ else if(arg_component_total>basic->size)
+ truncate_vector(call.arguments.front(), basic->size);
+ }
+ else if(arg_component_total==basic->size)
+ convert_args = true;
+ else
+ return;
+ }
+ else if(basic->kind==BasicTypeDeclaration::MATRIX)
+ {
+ unsigned column_count = basic->size&0xFFFF;
+ unsigned row_count = basic->size>>16;
+ if(call.arguments.size()==1)
+ {
+ /* A matrix can be constructed from a single element or another
+ matrix of sufficient size. */
+ if(arg_component_total==1)
+ convert_args = true;
+ else if(args.front().type->kind==BasicTypeDeclaration::MATRIX)
+ {
+ unsigned arg_columns = args.front().type->size&0xFFFF;
+ unsigned arg_rows = args.front().type->size>>16;
+ if(arg_columns<column_count || arg_rows<row_count)
+ return;
+
+ /* Always generate a temporary here and let the optimization
+ stage inline it if that's reasonable. */
+ RefPtr<VariableDeclaration> temporary = new VariableDeclaration;
+ temporary->type = args.front().type->name;
+ temporary->name = get_unused_variable_name(*current_block, "_temp");
+ temporary->init_expression = call.arguments.front();
+ current_block->body.insert(insert_point, temporary);
+
+ // Create expressions to build each column.
+ vector<RefPtr<Expression> > columns;
+ columns.reserve(column_count);
+ for(unsigned j=0; j<column_count; ++j)
+ {
+ RefPtr<VariableReference> ref = new VariableReference;
+ ref->name = temporary->name;
+
+ RefPtr<Literal> index = new Literal;
+ index->token = lexical_cast<string>(j);
+ index->value = static_cast<int>(j);
+
+ RefPtr<BinaryExpression> subscript = new BinaryExpression;
+ subscript->left = ref;
+ subscript->oper = &Operator::get_operator("[", Operator::BINARY);
+ subscript->right = index;
+ subscript->type = args.front().type->base_type;
+
+ columns.push_back(subscript);
+ if(arg_rows>row_count)
+ truncate_vector(columns.back(), row_count);
+ }
+
+ call.arguments.resize(column_count);
+ copy(columns.begin(), columns.end(), call.arguments.begin());
+
+ /* Let VariableResolver process the new nodes and finish
+ resolving the constructor on the next pass. */
+ r_any_resolved = true;
+ return;
+ }
+ else
+ return;
+ }
+ else if(arg_component_total==column_count*row_count && !has_matrices)
+ {
+ /* Construct a matrix from individual components in column-major
+ order. Arguments must align at column boundaries. */
+ vector<RefPtr<Expression> > columns;
+ columns.reserve(column_count);
+
+ vector<RefPtr<Expression> > column_args;
+ column_args.reserve(row_count);
+ unsigned column_component_count = 0;
+
+ for(unsigned j=0; j<call.arguments.size(); ++j)
+ {
+ const ArgumentInfo &info = args[j];
+ if(!column_component_count && info.type->kind==BasicTypeDeclaration::VECTOR && info.component_count==row_count)
+ // A vector filling the entire column can be used as is.
+ columns.push_back(call.arguments[j]);
+ else
+ {
+ column_args.push_back(call.arguments[j]);
+ column_component_count += info.component_count;
+ if(column_component_count==row_count)
+ {
+ /* The column has filled up. Create a vector constructor
+ for it.*/
+ RefPtr<FunctionCall> column_call = new FunctionCall;
+ column_call->name = basic->base_type->name;
+ column_call->constructor = true;
+ column_call->arguments.resize(column_args.size());
+ copy(column_args.begin(), column_args.end(), column_call->arguments.begin());
+ column_call->type = basic->base_type;
+ visit_constructor(*column_call);
+ columns.push_back(column_call);
+
+ column_args.clear();
+ column_component_count = 0;
+ }
+ else if(column_component_count>row_count)
+ // Argument alignment mismatch.
+ return;
+ }
+ }
+ }
+ else
+ return;
+ }
+ else
+ return;
+
+ if(convert_args)
+ {
+ // The argument list may have changed so can't rely on args.
+ for(NodeArray<Expression>::iterator j=call.arguments.begin(); j!=call.arguments.end(); ++j)
+ if(BasicTypeDeclaration *basic_arg = dynamic_cast<BasicTypeDeclaration *>((*j)->type))
+ {
+ BasicTypeDeclaration *elem_arg = get_element_type(*basic_arg);
+ if(elem_arg!=elem)
+ convert_to_element(*j, *elem);
+ }
+ }
+ }
+ else if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(i->second))
+ {
+ if(call.arguments.size()!=strct->members.body.size())
+ return;
+
+ unsigned k = 0;
+ for(NodeList<Statement>::const_iterator j=strct->members.body.begin(); j!=strct->members.body.end(); ++j, ++k)
+ {
+ if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(j->get()))
+ {
+ if(!call.arguments[k]->type || call.arguments[k]->type!=var->type_declaration)
+ return;
+ }
+ else
+ return;
+ }
+ }
+
+ resolve(call, i->second, false);
+}
+
void ExpressionResolver::visit(FunctionCall &call)
{
TraversingVisitor::visit(call);
- TypeDeclaration *type = 0;
if(call.declaration)
- type = call.declaration->return_type_declaration;
+ resolve(call, call.declaration->return_type_declaration, false);
else if(call.constructor)
- {
- map<string, TypeDeclaration *>::const_iterator i=stage->types.find(call.name);
- type = (i!=stage->types.end() ? i->second : 0);
- }
- resolve(call, type, false);
+ visit_constructor(call);
}
void ExpressionResolver::visit(BasicTypeDeclaration &type)
void FunctionResolver::visit(FunctionCall &call)
{
- string arg_types;
- bool has_signature = true;
- for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); (has_signature && i!=call.arguments.end()); ++i)
- {
- if((*i)->type)
- append(arg_types, ",", (*i)->type->name);
- else
- has_signature = false;
- }
-
FunctionDeclaration *declaration = 0;
- if(has_signature)
+ if(stage->types.count(call.name))
+ call.constructor = true;
+ else
{
- map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
- declaration = (i!=stage->functions.end() ? i->second : 0);
+ string arg_types;
+ bool has_signature = true;
+ for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); (has_signature && i!=call.arguments.end()); ++i)
+ {
+ if((*i)->type)
+ append(arg_types, ",", (*i)->type->name);
+ else
+ has_signature = false;
+ }
+
+ if(has_signature)
+ {
+ map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
+ declaration = (i!=stage->functions.end() ? i->second : 0);
+ }
}
+
r_any_resolved |= (declaration!=call.declaration);
call.declaration = declaration;
vector<FunctionDeclaration *> &decls = declarations[key];
if(func.definition==&func)
{
+ if(stage_decl && stage_decl->definition)
+ {
+ if(!func.overrd)
+ stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, func.source, func.line,
+ format("Overriding function '%s' without the override keyword is deprecated", key)));
+ if(!stage_decl->definition->virtua)
+ stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, func.source, func.line,
+ format("Overriding function '%s' not declared as virtual is deprecated", key)));
+ }
stage_decl = &func;
// Set all previous declarations to use this definition.
InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
{
- if(stage->interface_blocks.count("in"+out_block.name))
+ if(stage->interface_blocks.count("in"+out_block.block_name))
return 0;
InterfaceBlock *in_block = new InterfaceBlock;
in_block->interface = "in";
- in_block->name = out_block.name;
+ in_block->block_name = out_block.block_name;
in_block->members = new Block;
in_block->instance_name = out_block.instance_name;
if(stage->type==Stage::GEOMETRY)
}
iface_target_block->body.insert(iface_insert_point, in_block);
- stage->interface_blocks.insert(make_pair("in"+in_block->name, in_block));
+ stage->interface_blocks.insert(make_pair("in"+in_block->block_name, in_block));
if(!in_block->instance_name.empty())
stage->interface_blocks.insert(make_pair("_"+in_block->instance_name, in_block));
}
else if(var.interface=="in" && current_block==&stage->content)
{
- declared_inputs.push_back(&var);
+ if(var.name.compare(0, 3, "gl_"))
+ declared_inputs.push_back(&var);
/* Try to link input variables in global scope with output variables from
previous stage. */
if(!iface.linked_block && stage->previous)
{
const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
- map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out"+iface.name);
+ map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out"+iface.block_name);
if(i!=prev_blocks.end())
{
iface.linked_block = i->second;
projects / libs / gl.git / blobdiff