summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sondergaard <ts@medical-insight.com>2014-01-07 13:31:00 -0700
committerBrian Paul <brianp@vmware.com>2014-01-08 17:33:07 -0700
commite8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34 (patch)
tree6bac219ec4b92eaae88ec684d0265de7c5a61270
parent8fcddd325ce3dc5dfdafc95767542590ae860c45 (diff)
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" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/glsl/builtin_functions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index 2207fe14f1..038e47363a 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;
}