KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set, and require, a return type for function signatures

This commit is contained in:
Ian Romanick 2010-03-23 12:19:13 -07:00
parent 7563b50075
commit e39cc69fa3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ast_to_hir.cpp
View File

@ -1006,6 +1006,13 @@ ast_function_definition::hir(exec_list *instructions,
ast_function_parameters_to_hir(& this->prototype->parameters, & parameters,
state);
const char *return_type_name;
const glsl_type *return_type =
type_specifier_to_glsl_type(this->prototype->return_type->specifier,
& return_type_name, state);
assert(return_type != NULL);
/* Verify that this function's signature either doesn't match a previously
* seen signature for a function with the same name, or, if a match is found,
@ -1056,7 +1063,7 @@ ast_function_definition::hir(exec_list *instructions,
/* Finish storing the information about this new function in its signature.
*/
if (signature == NULL) {
signature = new ir_function_signature();
signature = new ir_function_signature(return_type);
f->signatures.push_tail(signature);
} else {
/* Destroy all of the previous parameter information. The previous

4
ir.cpp
View File

@ -96,8 +96,8 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name)
}
ir_function_signature::ir_function_signature(void)
: ir_instruction(ir_op_func_sig)
ir_function_signature::ir_function_signature(const glsl_type *return_type)
: ir_instruction(ir_op_func_sig), return_type(return_type), definition(NULL)
{
/* empty */
}

2
ir.h
View File

@ -126,7 +126,7 @@ public:
/*@{*/
class ir_function_signature : public ir_instruction {
public:
ir_function_signature(void);
ir_function_signature(const glsl_type *return_type);
virtual void accept(ir_visitor *v)
{