diff options
| author | Tapani Pälli <[email protected]> | 2013-12-12 15:08:59 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2013-12-12 17:28:11 +0200 |
| commit | 447bb9029f7e03b03e507053b9f63536d8fc74ac (patch) | |
| tree | cda0ab8ca2637995300aa4544e0cf733bfead1da /src/glsl/ir_validate.cpp | |
| parent | 33ee2c67c0a4e8f2fefbf37dacabd14918060af5 (diff) | |
glsl: move variables in to ir_variable::data, part II
This patch moves following bitfields and variables to the data
structure:
explicit_location, explicit_index, explicit_binding, has_initializer,
is_unmatched_generic_inout, location_frac, from_named_ifc_block_nonarray,
from_named_ifc_block_array, depth_layout, location, index, binding,
max_array_access, atomic
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Diffstat (limited to 'src/glsl/ir_validate.cpp')
| -rw-r--r-- | src/glsl/ir_validate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp index 4614cb7f876..4bbb3ce6599 100644 --- a/src/glsl/ir_validate.cpp +++ b/src/glsl/ir_validate.cpp @@ -642,9 +642,9 @@ ir_validate::visit(ir_variable *ir) * to be out of bounds. */ if (ir->type->array_size() > 0) { - if (ir->max_array_access >= ir->type->length) { + if (ir->data.max_array_access >= ir->type->length) { printf("ir_variable has maximum access out of bounds (%d vs %d)\n", - ir->max_array_access, ir->type->length - 1); + ir->data.max_array_access, ir->type->length - 1); ir->print(); abort(); } @@ -670,7 +670,7 @@ ir_validate::visit(ir_variable *ir) } } - if (ir->constant_initializer != NULL && !ir->has_initializer) { + if (ir->constant_initializer != NULL && !ir->data.has_initializer) { printf("ir_variable didn't have an initializer, but has a constant " "initializer value.\n"); ir->print(); |