Module: Mesa Branch: 10.0 Commit: 38235d292382ddf0c02369f407bb151362dafbd2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38235d292382ddf0c02369f407bb151362dafbd2
Author: Thomas Sondergaard <[email protected]> Date: Tue Jan 7 13:31:00 2014 -0700 mesa: Namespace qualify fma to override ambiguity with fma from math.h MSVC 2013 version of math.h includes an fma() function. Cc: "10.0" <[email protected]> Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34) --- src/glsl/builtin_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 8cb75e5..22f2d6d 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -3864,7 +3864,7 @@ builtin_builder::_fma(const glsl_type *type) ir_variable *c = in_var(type, "c"); MAKE_SIG(type, gpu_shader5, 3, a, b, c); - body.emit(ret(fma(a, b, c))); + body.emit(ret(ir_builder::fma(a, b, c))); return sig; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
