Mesa (master): glsl: support unsigned increment in ir_loop controls
Tapani Pälli
tpalli at kemper.freedesktop.org
Thu Aug 7 04:33:13 UTC 2014
Module: Mesa
Branch: master
Commit: 151fb1e808c051a078071c89ff996bdad037ed65
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=151fb1e808c051a078071c89ff996bdad037ed65
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Wed Jul 30 13:02:52 2014 +0300
glsl: support unsigned increment in ir_loop controls
Current version can create ir_expression where operands have
different base type, patch adds support for unsigned type.
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Tested-by: Michel Dänzer <michel.daenzer at amd.com>
https://bugs.freedesktop.org/show_bug.cgi?id=80880
---
src/glsl/loop_controls.cpp | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/glsl/loop_controls.cpp b/src/glsl/loop_controls.cpp
index 36b49eb..1c1d34f 100644
--- a/src/glsl/loop_controls.cpp
+++ b/src/glsl/loop_controls.cpp
@@ -123,9 +123,20 @@ calculate_iterations(ir_rvalue *from, ir_rvalue *to, ir_rvalue *increment,
bool valid_loop = false;
for (unsigned i = 0; i < Elements(bias); i++) {
- iter = (increment->type->is_integer())
- ? new(mem_ctx) ir_constant(iter_value + bias[i])
- : new(mem_ctx) ir_constant(float(iter_value + bias[i]));
+ /* Increment may be of type int, uint or float. */
+ switch (increment->type->base_type) {
+ case GLSL_TYPE_INT:
+ iter = new(mem_ctx) ir_constant(iter_value + bias[i]);
+ break;
+ case GLSL_TYPE_UINT:
+ iter = new(mem_ctx) ir_constant(unsigned(iter_value + bias[i]));
+ break;
+ case GLSL_TYPE_FLOAT:
+ iter = new(mem_ctx) ir_constant(float(iter_value + bias[i]));
+ break;
+ default:
+ unreachable(!"Unsupported type for loop iterator.");
+ }
ir_expression *const mul =
new(mem_ctx) ir_expression(ir_binop_mul, increment->type, iter,
More information about the mesa-commit
mailing list