Mesa (10.0): mesa: Fix compile error with MSVC 2013
Carl Worth
cworth at kemper.freedesktop.org
Thu Jan 9 20:57:13 UTC 2014
Module: Mesa
Branch: 10.0
Commit: 31e2824d995a24b5ae6b63980fc806ff1dd65b4f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31e2824d995a24b5ae6b63980fc806ff1dd65b4f
Author: Thomas Sondergaard <ts at medical-insight.com>
Date: Tue Jan 7 13:31:00 2014 -0700
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 at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 067ad6e53ec2545970b7698d06d2a537da194678)
---
src/glsl/ir_constant_expression.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 0efd1d5..02368b0 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;
More information about the mesa-commit
mailing list