diff options
author | Brian Paul <brianp@vmware.com> | 2014-01-06 16:11:21 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2014-01-06 16:57:49 -0700 |
commit | 8d1400fe123dc229e87a3a6316b0697f864695a3 (patch) | |
tree | d648642e320016d75cb5bf32b97e3eb4ff7b66b8 | |
parent | f6b10544cda34ec2e7f43de217e28ab2bdc2f63d (diff) |
glsl: rename min(), max() functions to fix MSVC build
Evidently, there's some other definition of "min" and "max" that
causes MSVC to choke on these function names. Renaming to min2()
and max2() fixes things.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r-- | src/glsl/builtin_functions.cpp | 6 | ||||
-rw-r--r-- | src/glsl/ir_builder.cpp | 4 | ||||
-rw-r--r-- | src/glsl/ir_builder.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index f56be0c691..10127f38ee 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -4073,7 +4073,7 @@ builtin_builder::_min3(builtin_available_predicate avail, ir_variable *z = in_var(z_type, "z"); MAKE_SIG(x_type, avail, 3, x, y, z); - ir_expression *min3 = min(x, min(y,z)); + ir_expression *min3 = min2(x, min2(y,z)); body.emit(ret(min3)); return sig; @@ -4089,7 +4089,7 @@ builtin_builder::_max3(builtin_available_predicate avail, ir_variable *z = in_var(z_type, "z"); MAKE_SIG(x_type, avail, 3, x, y, z); - ir_expression *max3 = max(x, max(y,z)); + ir_expression *max3 = max2(x, max2(y,z)); body.emit(ret(max3)); return sig; @@ -4105,7 +4105,7 @@ builtin_builder::_mid3(builtin_available_predicate avail, ir_variable *z = in_var(z_type, "z"); MAKE_SIG(x_type, avail, 3, x, y, z); - ir_expression *mid3 = max(min(x, y), max(min(x, z), min(y, z))); + ir_expression *mid3 = max2(min2(x, y), max2(min2(x, z), min2(y, z))); body.emit(ret(mid3)); return sig; diff --git a/src/glsl/ir_builder.cpp b/src/glsl/ir_builder.cpp index 31ed1916cc..7f41ed69ef 100644 --- a/src/glsl/ir_builder.cpp +++ b/src/glsl/ir_builder.cpp @@ -211,12 +211,12 @@ ir_expression *sub(operand a, operand b) return expr(ir_binop_sub, a, b); } -ir_expression *min(operand a, operand b) +ir_expression *min2(operand a, operand b) { return expr(ir_binop_min, a, b); } -ir_expression *max(operand a, operand b) +ir_expression *max2(operand a, operand b) { return expr(ir_binop_max, a, b); } diff --git a/src/glsl/ir_builder.h b/src/glsl/ir_builder.h index 4b85ea1395..f00e6f3b38 100644 --- a/src/glsl/ir_builder.h +++ b/src/glsl/ir_builder.h @@ -184,8 +184,8 @@ ir_expression *i2b(operand a); ir_expression *f2b(operand a); ir_expression *b2f(operand a); -ir_expression *min(operand a, operand b); -ir_expression *max(operand a, operand b); +ir_expression *min2(operand a, operand b); +ir_expression *max2(operand a, operand b); ir_expression *fma(operand a, operand b, operand c); ir_expression *lrp(operand x, operand y, operand a); |