aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/builtin_functions.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 16:58:49 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 16:58:49 +0100
commit6d8fefe38077f4d532c256e79cfcaf2a46c5269d (patch)
treedfc74a8d253b690dac620212cbb9d46001cdaa2b /mesalib/src/glsl/builtin_functions.cpp
parent0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (diff)
downloadvcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.tar.gz
vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.tar.bz2
vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.zip
Now use visual studio 2013 express edition for compilation
Diffstat (limited to 'mesalib/src/glsl/builtin_functions.cpp')
-rw-r--r--mesalib/src/glsl/builtin_functions.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp
index 8cb75e5ad..a45de091b 100644
--- a/mesalib/src/glsl/builtin_functions.cpp
+++ b/mesalib/src/glsl/builtin_functions.cpp
@@ -558,7 +558,7 @@ private:
B1(bitCount)
B1(findLSB)
B1(findMSB)
- B1(fma)
+ B1(fma_mesa)
B2(ldexp)
B2(frexp)
B1(uaddCarry)
@@ -2053,7 +2053,7 @@ builtin_builder::create_builtins()
IU(bitCount)
IU(findLSB)
IU(findMSB)
- F(fma)
+ F(fma_mesa)
add_function("ldexp",
_ldexp(glsl_type::float_type, glsl_type::int_type),
@@ -3857,14 +3857,14 @@ builtin_builder::_findMSB(const glsl_type *type)
}
ir_function_signature *
-builtin_builder::_fma(const glsl_type *type)
+builtin_builder::_fma_mesa(const glsl_type *type)
{
ir_variable *a = in_var(type, "a");
ir_variable *b = in_var(type, "b");
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(fma_mesa(a, b, c)));
return sig;
}