summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-07-21 18:01:22 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-07-28 15:46:27 -0700
commit2eaf31642c83086b06dce057997ae4bc4b1bce2c (patch)
treeb983c7349d8a94af721d3fc5256fb4c89deb402b /src
parent7bcaa3828f8d3d39cfece5d91e47ed2a135a9471 (diff)
ir_constant_expression: Add support for the "distance" builtin.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ir_constant_expression.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index e68a7b1a2a..52f53d9ff4 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -854,7 +854,13 @@ ir_call::constant_expression_value()
for (unsigned c = 0; c < op[0]->type->components(); c++)
data.f[c] = 180.0/M_PI * op[0]->value.f[c];
} else if (strcmp(callee, "distance") == 0) {
- return NULL; /* FINISHME: implement this */
+ assert(op[0]->type->is_float() && op[1]->type->is_float());
+ float length_squared = 0.0;
+ for (unsigned c = 0; c < op[0]->type->components(); c++) {
+ float t = op[0]->value.f[c] - op[1]->value.f[c];
+ length_squared += t * t;
+ }
+ return new(mem_ctx) ir_constant(sqrtf(length_squared));
} else if (strcmp(callee, "dot") == 0) {
expr = new(mem_ctx) ir_expression(ir_binop_dot, type, op[0], op[1]);
} else if (strcmp(callee, "equal") == 0) {