aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
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
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')
-rw-r--r--mesalib/src/glsl/builtin_functions.cpp8
-rw-r--r--mesalib/src/glsl/ir.cpp2
-rw-r--r--mesalib/src/glsl/ir_builder.cpp2
-rw-r--r--mesalib/src/glsl/ir_builder.h2
-rwxr-xr-xmesalib/src/glsl/ir_constant_expression.cpp7
5 files changed, 7 insertions, 14 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;
}
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index 1b4973612..9715a203e 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -560,7 +560,7 @@ static const char *const operator_strs[] = {
"ubo_load",
"ldexp",
"vector_extract",
- "fma",
+ "fma_mesa",
"lrp",
"csel",
"bfi",
diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp
index 6c49734be..6fd58de0e 100644
--- a/mesalib/src/glsl/ir_builder.cpp
+++ b/mesalib/src/glsl/ir_builder.cpp
@@ -496,7 +496,7 @@ b2f(operand a)
}
ir_expression *
-fma(operand a, operand b, operand c)
+fma_mesa(operand a, operand b, operand c)
{
return expr(ir_triop_fma, a, b, c);
}
diff --git a/mesalib/src/glsl/ir_builder.h b/mesalib/src/glsl/ir_builder.h
index 1f0778870..52cc2168f 100644
--- a/mesalib/src/glsl/ir_builder.h
+++ b/mesalib/src/glsl/ir_builder.h
@@ -184,7 +184,7 @@ ir_expression *i2b(operand a);
ir_expression *f2b(operand a);
ir_expression *b2f(operand a);
-ir_expression *fma(operand a, operand b, operand c);
+ir_expression *fma_mesa(operand a, operand b, operand c);
ir_expression *lrp(operand x, operand y, operand a);
ir_expression *csel(operand a, operand b, operand c);
ir_expression *bitfield_insert(operand a, operand b, operand c, operand d);
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp
index 02368b0f4..54bfe5832 100755
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
@@ -53,13 +53,6 @@ static int isnormal(double x)
}
#endif
-#if defined(_MSC_VER)
-static double copysign(double x, double y)
-{
- return _copysign(x, y);
-}
-#endif
-
static float
dot(ir_constant *op0, ir_constant *op1)
{