Mesa (master): mesa: Namespace qualify fma to override ambiguity with fma from math.h
Brian Paul
brianp at kemper.freedesktop.org
Thu Jan 9 00:34:57 UTC 2014
Module: Mesa
Branch: master
Commit: e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34
Author: Thomas Sondergaard <ts at medical-insight.com>
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" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
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 2207fe1..038e473 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;
}
More information about the mesa-commit
mailing list