Mesa (master): vbo: fix MSVC double->float conversion warnings
Brian Paul
brianp at kemper.freedesktop.org
Thu Oct 31 14:38:42 UTC 2013
Module: Mesa
Branch: master
Commit: 0e2f0baa43b7d06c88168fdbcff3e26b6dd4970b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e2f0baa43b7d06c88168fdbcff3e26b6dd4970b
Author: Brian Paul <brianp at vmware.com>
Date: Tue Oct 29 14:11:28 2013 -0600
vbo: fix MSVC double->float conversion warnings
---
src/mesa/vbo/vbo_attrib_tmp.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index 02c283d..bbc0205 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -140,7 +140,7 @@ static inline float conv_i10_to_norm_float(const struct gl_context *ctx, int i10
(ctx->API == API_OPENGL_CORE && ctx->Version >= 42)) {
/* Equation 2.3 above. */
float f = ((float) val.x) / 511.0F;
- return MAX2(f, -1.0);
+ return MAX2(f, -1.0f);
} else {
/* Equation 2.2 above. */
return (2.0F * (float)val.x + 1.0F) * (1.0F / 1023.0F);
@@ -156,7 +156,7 @@ static inline float conv_i2_to_norm_float(const struct gl_context *ctx, int i2)
(ctx->API == API_OPENGL_CORE && ctx->Version >= 42)) {
/* Equation 2.3 above. */
float f = (float) val.x;
- return MAX2(f, -1.0);
+ return MAX2(f, -1.0f);
} else {
/* Equation 2.2 above. */
return (2.0F * (float)val.x + 1.0F) * (1.0F / 3.0F);
More information about the mesa-commit
mailing list