From: Brian Paul <brianp@vmware.com>
Date: Sat, 7 Jan 2012 21:16:27 +0000 (-0700)
Subject: meta: add some 'f' suffixes to silence MSVC warnings
X-Git-Tag: mesa-8.0-rc1~173
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fc6db6708048166743a2d9aa62083c040effa8a;p=platform%2Fupstream%2Fmesa.git

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

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,