diff options
| author | Brian Paul <[email protected]> | 2014-01-06 16:11:21 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-01-06 16:57:49 -0700 |
| commit | 8d1400fe123dc229e87a3a6316b0697f864695a3 (patch) | |
| tree | d648642e320016d75cb5bf32b97e3eb4ff7b66b8 /src/glsl/ir_builder.h | |
| 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 <[email protected]>
Diffstat (limited to 'src/glsl/ir_builder.h')
| -rw-r--r-- | src/glsl/ir_builder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/ir_builder.h b/src/glsl/ir_builder.h index 4b85ea13958..f00e6f3b38c 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); |