summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-07-21 21:56:13 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-07-28 15:46:26 -0700
commitf914915d8e86f492cfcbbf834df601251bbba033 (patch)
treebab7f48da0d0bd4bec5ff7fbbca2707011b432df /src
parentf7b94f32a22a769fc71065ca6515186e5a8e3a96 (diff)
ir_constant_expression: Use Mesa's MIN2/MAX2 instead of our own.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ir_constant_expression.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 6a07f4e189..9309b61898 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -34,13 +34,11 @@
*/
#include <math.h>
+#include "main/macros.h"
#include "ir.h"
#include "ir_visitor.h"
#include "glsl_types.h"
-#define min(x,y) (x) < (y) ? (x) : (y)
-#define max(x,y) (x) > (y) ? (x) : (y)
-
ir_constant *
ir_expression::constant_expression_value()
{
@@ -355,13 +353,13 @@ ir_expression::constant_expression_value()
switch (op[0]->type->base_type) {
case GLSL_TYPE_UINT:
- data.u[c] = min(op[0]->value.u[c0], op[1]->value.u[c1]);
+ data.u[c] = MIN2(op[0]->value.u[c0], op[1]->value.u[c1]);
break;
case GLSL_TYPE_INT:
- data.i[c] = min(op[0]->value.i[c0], op[1]->value.i[c1]);
+ data.i[c] = MIN2(op[0]->value.i[c0], op[1]->value.i[c1]);
break;
case GLSL_TYPE_FLOAT:
- data.f[c] = min(op[0]->value.f[c0], op[1]->value.f[c1]);
+ data.f[c] = MIN2(op[0]->value.f[c0], op[1]->value.f[c1]);
break;
default:
assert(0);
@@ -377,13 +375,13 @@ ir_expression::constant_expression_value()
switch (op[0]->type->base_type) {
case GLSL_TYPE_UINT:
- data.u[c] = max(op[0]->value.u[c0], op[1]->value.u[c1]);
+ data.u[c] = MAX2(op[0]->value.u[c0], op[1]->value.u[c1]);
break;
case GLSL_TYPE_INT:
- data.i[c] = max(op[0]->value.i[c0], op[1]->value.i[c1]);
+ data.i[c] = MAX2(op[0]->value.i[c0], op[1]->value.i[c1]);
break;
case GLSL_TYPE_FLOAT:
- data.f[c] = max(op[0]->value.f[c0], op[1]->value.f[c1]);
+ data.f[c] = MAX2(op[0]->value.f[c0], op[1]->value.f[c1]);
break;
default:
assert(0);