OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir_constant_expression: Use Mesa's MIN2/MAX2 instead of our own.

Browse Source
This commit is contained in:
Kenneth Graunke
2010-07-21 21:56:13 -07:00
parent f7b94f32a2
commit f914915d8e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/glsl/ir_constant_expression.cpp
View File

@@ -34,13 +34,11 @@
*/ */
#include <math.h> #include <math.h>
#include "main/macros.h"
#include "ir.h" #include "ir.h"
#include "ir_visitor.h" #include "ir_visitor.h"
#include "glsl_types.h" #include "glsl_types.h"
#define min(x,y) (x) < (y) ? (x) : (y)
#define max(x,y) (x) > (y) ? (x) : (y)
ir_constant * ir_constant *
ir_expression::constant_expression_value() ir_expression::constant_expression_value()
{ {
@@ -355,13 +353,13 @@ ir_expression::constant_expression_value()
switch (op[0]->type->base_type) { switch (op[0]->type->base_type) {
case GLSL_TYPE_UINT: 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; break;
case GLSL_TYPE_INT: 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; break;
case GLSL_TYPE_FLOAT: 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; break;
default: default:
assert(0); assert(0);
@@ -377,13 +375,13 @@ ir_expression::constant_expression_value()
switch (op[0]->type->base_type) { switch (op[0]->type->base_type) {
case GLSL_TYPE_UINT: 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; break;
case GLSL_TYPE_INT: 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; break;
case GLSL_TYPE_FLOAT: 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; break;
default: default:
assert(0); assert(0);