summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2016-07-12 16:42:09 -0700
committerIan Romanick <ian.d.romanick@intel.com>2016-08-30 16:28:02 -0700
commit6e09c8715de5320dca433c4379fac59efc99c5a8 (patch)
tree5d30e3d6883145bd1b83770553e40f2a66acb5fe /src/compiler
parentf8e185a65fe65a897c35caff3ba498525ca71be8 (diff)
glsl: Generate code for constant ir_quadop_vector expressions
v2: 'for (a, b) in d' => 'for a, b in d'. Suggested by Dylan. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Acked-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/ir_expression_operation.py22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/compiler/glsl/ir_expression_operation.py b/src/compiler/glsl/ir_expression_operation.py
index 22da8cb7e84..5c899a743ee 100644
--- a/src/compiler/glsl/ir_expression_operation.py
+++ b/src/compiler/glsl/ir_expression_operation.py
@@ -316,6 +316,22 @@ constant_template_vector_insert = mako.template.Template("""\
break;
}""")
+# This template is for ir_quadop_vector.
+constant_template_vector = mako.template.Template("""\
+ case ${op.get_enum_name()}:
+ for (unsigned c = 0; c < this->type->vector_elements; c++) {
+ switch (this->type->base_type) {
+ % for dst_type, src_types in op.signatures():
+ case ${src_types[0].glsl_type}:
+ data.${dst_type.union_field}[c] = op[c]->value.${src_types[0].union_field}[0];
+ break;
+ % endfor
+ default:
+ assert(0);
+ }
+ }
+ break;""")
+
vector_scalar_operation = "vector-scalar"
horizontal_operation = "horizontal"
@@ -403,7 +419,9 @@ class operation(object):
else:
return constant_template3.render(op=self)
elif self.num_operands == 4:
- if types_identical_operation in self.flags:
+ if self.name == "vector":
+ return constant_template_vector.render(op=self)
+ elif types_identical_operation in self.flags:
return constant_template0.render(op=self)
return None
@@ -676,7 +694,7 @@ ir_expression_operation = [
c_expression="bitfield_insert({src0}, {src1}, {src2}, {src3})",
flags=types_identical_operation),
- operation("vector", 4),
+ operation("vector", 4, source_types=all_types, c_expression="anything-except-None"),
]