summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Sondergaard <ts@medical-insight.com>2014-01-07 13:31:00 -0700
committerCarl Worth <cworth@cworth.org>2014-01-09 12:22:40 -0800
commit31e2824d995a24b5ae6b63980fc806ff1dd65b4f (patch)
treedbc15162560571905627d014c5517bf3f4c43e89 /src
parent700b916da112cd788e297c11d08b64495921155f (diff)
mesa: Fix compile error with MSVC 2013
This fixes the following compile error: src\glsl\ir_constant_expression.cpp(1405) : error C2666: 'copysign' : 3 overloads have similar conversions Cc: "10.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 067ad6e53ec2545970b7698d06d2a537da194678)
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ir_constant_expression.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 0efd1d5b3af..02368b0f45e 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -1402,7 +1402,7 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
data.f[c] = ldexp(op[0]->value.f[c], op[1]->value.i[c]);
/* Flush subnormal values to zero. */
if (!isnormal(data.f[c]))
- data.f[c] = copysign(0.0, op[0]->value.f[c]);
+ data.f[c] = copysign(0.0f, op[0]->value.f[c]);
}
break;