projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f6b1054) | patch
glsl: rename min(), max() functions to fix MSVC build
authorBrian Paul <brianp@vmware.com>
Mon, 6 Jan 2014 23:11:21 +0000 (16:11 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 6 Jan 2014 23:57:49 +0000 (16:57 -0700)
commit8d1400fe123dc229e87a3a6316b0697f864695a3
treed648642e320016d75cb5bf32b97e3eb4ff7b66b8tree
parentf6b10544cda34ec2e7f43de217e28ab2bdc2f63dcommit | 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>
src/glsl/builtin_functions.cpp diff | blob | history
src/glsl/ir_builder.cpp diff | blob | history
src/glsl/ir_builder.h diff | blob | history