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

glsl: Handle instance array declarations 

v2: Add a comment and an assertion about the array size in the
non-instance name case.  Suggested by Paul Berry.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2013-01-21 23:06:45 -05:00
parent 5383661092
commit 25e75b0a13
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/glsl/ast_to_hir.cpp
View File

@ -4273,14 +4273,30 @@ ast_uniform_block::hir(exec_list *instructions,
* field selector ( . ) operator (analogously to structures)."
*/
if (this->instance_name) {
ir_variable *var = new(state) ir_variable(block_type,
this->instance_name,
ir_var_uniform);
ir_variable *var;
if (this->array_size != NULL) {
const glsl_type *block_array_type =
process_array_type(&loc, block_type, this->array_size, state);
var = new(state) ir_variable(block_array_type,
this->instance_name,
ir_var_uniform);
} else {
var = new(state) ir_variable(block_type,
this->instance_name,
ir_var_uniform);
}
var->interface_type = block_type;
state->symbols->add_variable(var);
instructions->push_tail(var);
} else {
/* In order to have an array size, the block must also be declared with
* an instane name.
*/
assert(this->array_size == NULL);
for (unsigned i = 0; i < num_variables; i++) {
ir_variable *var =
new(state) ir_variable(fields[i].type,