[Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-07 Thread Maxence Le Doré
Thanks Brian. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-07 Thread Erik Faye-Lund
On Tue, Jan 7, 2014 at 4:11 PM, Brian Paul wrote: > On 01/07/2014 08:03 AM, Erik Faye-Lund wrote: >> Why was this pushed out prematurely, then? Reviewing within two hours >> seems to be reasonable, no? > > > I got Kenneth's R-b so I pushed it. I saw no reason to wait. Also, I don't > like build

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-07 Thread Jose Fonseca
- Original Message - > On Tue, Jan 7, 2014 at 3:59 PM, Brian Paul wrote: > > On 01/06/2014 05:22 PM, Erik Faye-Lund wrote: > >> > >> On Tue, Jan 7, 2014 at 12:12 AM, Brian Paul wrote: > >>> > >>> Evidently, there's some other definition of "min" and "max" that > >>> causes MSVC to choke o

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-07 Thread Brian Paul
On 01/07/2014 08:03 AM, Erik Faye-Lund wrote: On Tue, Jan 7, 2014 at 3:59 PM, Brian Paul wrote: On 01/06/2014 05:22 PM, Erik Faye-Lund wrote: On Tue, Jan 7, 2014 at 12:12 AM, Brian Paul wrote: Evidently, there's some other definition of "min" and "max" that causes MSVC to choke on these fu

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-07 Thread Erik Faye-Lund
On Tue, Jan 7, 2014 at 3:59 PM, Brian Paul wrote: > On 01/06/2014 05:22 PM, Erik Faye-Lund wrote: >> >> On Tue, Jan 7, 2014 at 12:12 AM, Brian Paul wrote: >>> >>> Evidently, there's some other definition of "min" and "max" that >>> causes MSVC to choke on these function names. Renaming to min2()

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-07 Thread Brian Paul
On 01/06/2014 05:22 PM, Erik Faye-Lund wrote: On Tue, Jan 7, 2014 at 12:12 AM, Brian Paul wrote: 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. Wouldn't it be easier to just make sure

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-06 Thread Erik Faye-Lund
On Tue, Jan 7, 2014 at 12:12 AM, Brian Paul wrote: > 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. Wouldn't it be easier to just make sure NOMINMAX is defined before including any sys

Re: [Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-06 Thread Kenneth Graunke
On 01/06/2014 03:12 PM, Brian Paul wrote: > 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. That's really strange...but I'm fine with renaming them. Sorry for the trouble. Reviewed-by:

[Mesa-dev] [PATCH] glsl: rename min(), max() functions to fix MSVC build

2014-01-06 Thread Brian Paul
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. --- src/glsl/builtin_functions.cpp |6 +++--- src/glsl/ir_builder.cpp|4 ++-- src/glsl/ir_builder.h |4 ++-- 3 fi