summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-07-21 18:18:16 -0700
committerKenneth Graunke <[email protected]>2010-07-28 15:46:28 -0700
commit4b1d77ea966771dc5fbdac90dfec1b6066afe3f8 (patch)
treeac5390e858f2a6ec2d0982791936a7132ba78d67
parent557827340aedbf64d2486226924d00c94107c9e8 (diff)
ir_constant_expression: Remove support for dot products of integers.
This shouldn't be required since dot is only defined for floating point types, even in GLSL 4.0.
-rw-r--r--src/glsl/ir_constant_expression.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index cce13139b77..799bd4a60b7 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -327,21 +327,10 @@ ir_expression::constant_expression_value()
case ir_binop_dot:
assert(op[0]->type->is_vector() && op[1]->type->is_vector());
+ assert(op[0]->type->is_float() && op[1]->type->is_float());
data.f[0] = 0;
for (unsigned c = 0; c < op[0]->type->components(); c++) {
- switch (op[0]->type->base_type) {
- case GLSL_TYPE_UINT:
- data.u[0] += op[0]->value.u[c] * op[1]->value.u[c];
- break;
- case GLSL_TYPE_INT:
- data.i[0] += op[0]->value.i[c] * op[1]->value.i[c];
- break;
- case GLSL_TYPE_FLOAT:
- data.f[0] += op[0]->value.f[c] * op[1]->value.f[c];
- break;
- default:
- assert(0);
- }
+ data.f[0] += op[0]->value.f[c] * op[1]->value.f[c];
}
break;