diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-23 13:21:22 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-28 18:22:54 -0700 |
commit | 82baaf428308e83ad28ca0914c13af59e8a28374 (patch) | |
tree | b4651591b0eb218a5847800255eea6c0af461741 /glsl_types.cpp | |
parent | 85ba37b97df8edd18b757bc475b12b66f4b117ed (diff) |
glsl_type::generate_constructor_prototype now generates the function too
Also, change the name of the method to generate_constructor.
Diffstat (limited to 'glsl_types.cpp')
-rw-r--r-- | glsl_types.cpp | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/glsl_types.cpp b/glsl_types.cpp index 720dce79a1..a293ce7286 100644 --- a/glsl_types.cpp +++ b/glsl_types.cpp @@ -133,7 +133,7 @@ const glsl_type *glsl_type::get_base_type() const ir_function * -glsl_type::generate_constructor_prototype(glsl_symbol_table *symtab) const +glsl_type::generate_constructor(glsl_symbol_table *symtab) const { /* Generate the function name and add it to the symbol table. */ @@ -145,6 +145,8 @@ glsl_type::generate_constructor_prototype(glsl_symbol_table *symtab) const ir_function_signature *const sig = new ir_function_signature(this); f->add_signature(sig); + ir_variable **declarations = + (ir_variable **) malloc(sizeof(ir_variable *) * this->length); for (unsigned i = 0; i < length; i++) { char *const param_name = (char *) malloc(10); @@ -155,9 +157,35 @@ glsl_type::generate_constructor_prototype(glsl_symbol_table *symtab) const : new ir_variable(fields.structure[i].type, param_name); var->mode = ir_var_in; + declarations[i] = var; sig->parameters.push_tail(var); } + /* Generate the body of the constructor. The body assigns each of the + * parameters to a portion of a local variable called __retval that has + * the same type as the constructor. After initializing __retval, + * __retval is returned. + */ + ir_variable *retval = new ir_variable(this, "__retval"); + sig->body.push_tail(retval); + + for (unsigned i = 0; i < length; i++) { + ir_dereference *const lhs = (this->base_type == GLSL_TYPE_ARRAY) + ? new ir_dereference(retval, new ir_constant(i)) + : new ir_dereference(retval, fields.structure[i].name); + + ir_dereference *const rhs = new ir_dereference(declarations[i]); + ir_instruction *const assign = new ir_assignment(lhs, rhs, NULL); + + sig->body.push_tail(assign); + } + + free(declarations); + + ir_dereference *const retref = new ir_dereference(retval); + ir_instruction *const inst = new ir_return(retref); + sig->body.push_tail(inst); + return f; } |