Mesa (master): mesa: 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: 6bf7d402149b36e0eac7c385c561ec6277a8339d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6bf7d402149b36e0eac7c385c561ec6277a8339d

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

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

---

 src/mesa/main/format_pack.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index 4367711..0982c9a 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -2532,10 +2532,10 @@ _mesa_pack_colormask(gl_format format, const GLubyte colorMask[4], void *dst)
          GLuint i;
 
          /* this should put non-zero values into the channels of dst */
-         maskColor[0] = colorMask[0] ? -1.0 : 0.0;
-         maskColor[1] = colorMask[1] ? -1.0 : 0.0;
-         maskColor[2] = colorMask[2] ? -1.0 : 0.0;
-         maskColor[3] = colorMask[3] ? -1.0 : 0.0;
+         maskColor[0] = colorMask[0] ? -1.0f : 0.0f;
+         maskColor[1] = colorMask[1] ? -1.0f : 0.0f;
+         maskColor[2] = colorMask[2] ? -1.0f : 0.0f;
+         maskColor[3] = colorMask[3] ? -1.0f : 0.0f;
          _mesa_pack_float_rgba_row(format, 1,
                                    (const GLfloat (*)[4]) maskColor, dst);
 




More information about the mesa-commit mailing list