Mesa (master): postprocess: silence some MSVC float/int warnings

Brian Paul brianp at kemper.freedesktop.org
Thu Mar 21 15:40:04 UTC 2013


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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Mar 20 10:54:07 2013 -0600

postprocess: silence some MSVC float/int warnings

---

 src/gallium/auxiliary/postprocess/pp_init.c |    4 ++--
 src/gallium/auxiliary/postprocess/pp_mlaa.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c
index d955273..89aa501 100644
--- a/src/gallium/auxiliary/postprocess/pp_init.c
+++ b/src/gallium/auxiliary/postprocess/pp_init.c
@@ -260,8 +260,8 @@ pp_init_fbos(struct pp_queue_t *ppq, unsigned int w,
    p->framebuffer.width = w;
    p->framebuffer.height = h;
 
-   p->viewport.scale[0] = p->viewport.translate[0] = (float) w / 2.0;
-   p->viewport.scale[1] = p->viewport.translate[1] = (float) h / 2.0;
+   p->viewport.scale[0] = p->viewport.translate[0] = (float) w / 2.0f;
+   p->viewport.scale[1] = p->viewport.translate[1] = (float) h / 2.0f;
    p->viewport.scale[3] = 1.0f;
    p->viewport.translate[3] = 0.0f;
 
diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c
index 297f3e4..fcbc573 100644
--- a/src/gallium/auxiliary/postprocess/pp_mlaa.c
+++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c
@@ -91,8 +91,8 @@ pp_jimenezmlaa_run(struct pp_queue_t *ppq, struct pipe_resource *in,
    /* Init the pixel size constant */
    if (dimensions[0] != p->framebuffer.width ||
        dimensions[1] != p->framebuffer.height) {
-      constants[0] = 1.0 / p->framebuffer.width;
-      constants[1] = 1.0 / p->framebuffer.height;
+      constants[0] = 1.0f / p->framebuffer.width;
+      constants[1] = 1.0f / p->framebuffer.height;
 
       up_consts(p->pipe);
       dimensions[0] = p->framebuffer.width;




More information about the mesa-commit mailing list