summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Sondergaard <ts@medical-insight.com>2014-01-07 13:31:00 -0700
committerCarl Worth <cworth@cworth.org>2014-01-09 12:23:32 -0800
commit38235d292382ddf0c02369f407bb151362dafbd2 (patch)
tree868b0599f50878a5da1ea3128f48513c7fc8157c /src
parent0df489f0e076f077e363a28171405ee4e2def12b (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> (cherry picked from commit e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34)
Diffstat (limited to 'src')
-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 8cb75e5ad6e..22f2d6d1f2b 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;
}