From: Thomas Sondergaard <ts@medical-insight.com>
Date: Tue, 7 Jan 2014 20:31:00 +0000 (-0700)
Subject: mesa: Namespace qualify fma to override ambiguity with fma from math.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8ff08edd823ddf6b0e07ef84d2ba8afc3abbc34;p=mesa.git

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>
---

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;
 }