From e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34 Mon Sep 17 00:00:00 2001 From: Thomas Sondergaard Date: Tue, 7 Jan 2014 13:31:00 -0700 Subject: [PATCH] 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" Reviewed-by: Brian Paul --- 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 2207fe14f12..038e47363a4 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -3936,7 +3936,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; } -- 2.30.2