diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2013-03-12 12:42:51 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-05-13 12:05:18 -0700 |
commit | dafd6918f305274c8374bf9d427d90a3dabe13cb (patch) | |
tree | ffedaac8613427a35f801b23cc8865583655a130 /src/glsl/ir_constant_expression.cpp | |
parent | f274a2ca8733059bdd4f1c456ed4f6df7d7ec008 (diff) | |
download | external_mesa3d-dafd6918f305274c8374bf9d427d90a3dabe13cb.zip external_mesa3d-dafd6918f305274c8374bf9d427d90a3dabe13cb.tar.gz external_mesa3d-dafd6918f305274c8374bf9d427d90a3dabe13cb.tar.bz2 |
glsl: Add ir_triop_vector_insert
The new opcode is used to generate a new vector with a single field from
the source vector replaced. This will eventually replace
ir_dereference_array of vectors in the LHS of assignments.
v2: Convert tabs to spaces. Suggested by Eric.
v3: Add constant expression handling for ir_triop_vector_insert. This
prevents the constant matrix inversion tests from regressing. Duh.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl/ir_constant_expression.cpp')
-rw-r--r-- | src/glsl/ir_constant_expression.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 990f983..0a725b4 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/glsl/ir_constant_expression.cpp @@ -1388,6 +1388,31 @@ ir_expression::constant_expression_value(struct hash_table *variable_context) break; } + case ir_triop_vector_insert: { + const unsigned idx = op[2]->value.u[0]; + + memcpy(&data, &op[0]->value, sizeof(data)); + + switch (this->type->base_type) { + case GLSL_TYPE_INT: + data.i[idx] = op[1]->value.i[0]; + break; + case GLSL_TYPE_UINT: + data.u[idx] = op[1]->value.u[0]; + break; + case GLSL_TYPE_FLOAT: + data.f[idx] = op[1]->value.f[0]; + break; + case GLSL_TYPE_BOOL: + data.b[idx] = op[1]->value.b[0]; + break; + default: + assert(!"Should not get here."); + break; + } + break; + } + case ir_quadop_bitfield_insert: { int offset = op[2]->value.i[0]; int bits = op[3]->value.i[0]; |