Mesa (master): meta: add some 'f' suffixes to silence MSVC warnings

Brian Paul brianp at kemper.freedesktop.org
Sat Jan 7 21:19:01 UTC 2012


Module: Mesa
Branch: master
Commit: 5fc6db6708048166743a2d9aa62083c040effa8a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fc6db6708048166743a2d9aa62083c040effa8a

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan  7 14:16:27 2012 -0700

meta: add some 'f' suffixes to silence MSVC warnings

---

 src/mesa/drivers/common/meta.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 785a595..d8a2591 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1026,7 +1026,7 @@ _mesa_meta_in_progress(struct gl_context *ctx)
 static INLINE GLfloat
 invert_z(GLfloat normZ)
 {
-   GLfloat objZ = 1.0 - 2.0 * normZ;
+   GLfloat objZ = 1.0f - 2.0f * normZ;
    return objZ;
 }
 
@@ -2920,7 +2920,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
 
    /* setup texcoords (XXX what about border?) */
    setup_texture_coords(faceTarget,
-                        0.0, 0.0, /* width, height never used here */
+                        0.0f, 0.0f, /* width, height never used here */
                         slice,
                         verts[0].tex,
                         verts[1].tex,




More information about the mesa-commit mailing list