projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8fcddd3
)
mesa: Namespace qualify fma to override ambiguity with fma from math.h
author
Thomas Sondergaard
<ts@medical-insight.com>
Tue, 7 Jan 2014 20:31:00 +0000
(13:31 -0700)
committer
Brian Paul
<brianp@vmware.com>
Thu, 9 Jan 2014 00:33:07 +0000
(17:33 -0700)
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>
src/glsl/builtin_functions.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/builtin_functions.cpp
b/src/glsl/builtin_functions.cpp
index 2207fe14f123ec13c9e9ca2b1286281852b329c3..038e47363a440f50137592a71df65a1ef2b26804 100644
(file)
--- 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;
}