summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compiler/glsl/ir_expression_operation.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/compiler/glsl/ir_expression_operation.py b/src/compiler/glsl/ir_expression_operation.py
index 8dfcf2c0397..d5a06f864eb 100644
--- a/src/compiler/glsl/ir_expression_operation.py
+++ b/src/compiler/glsl/ir_expression_operation.py
@@ -365,22 +365,21 @@ class operation(object):
if self.c_expression is None:
return None
- if self.num_operands == 1:
- if horizontal_operation in self.flags and non_assign_operation in self.flags:
+ if horizontal_operation in self.flags:
+ if non_assign_operation in self.flags:
return constant_template_horizontal_nonassignment.render(op=self)
- elif horizontal_operation in self.flags:
+ elif types_identical_operation in self.flags:
+ return constant_template_horizontal_single_implementation.render(op=self)
+ else:
return constant_template_horizontal.render(op=self)
- elif self.num_operands == 2:
+
+ if self.num_operands == 2:
if self.name == "mul":
return constant_template_mul.render(op=self)
elif self.name == "vector_extract":
return constant_template_vector_extract.render(op=self)
elif vector_scalar_operation in self.flags:
return constant_template_vector_scalar.render(op=self)
- elif horizontal_operation in self.flags and types_identical_operation in self.flags:
- return constant_template_horizontal_single_implementation.render(op=self)
- elif horizontal_operation in self.flags:
- return constant_template_horizontal.render(op=self)
elif self.num_operands == 3:
if self.name == "vector_insert":
return constant_template_vector_insert.render(op=self)