Mesa (master): vc4: Use cl_f() instead of cl_u32(fui())

Eric Anholt anholt at kemper.freedesktop.org
Fri Aug 15 19:04:13 UTC 2014


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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 13 14:46:06 2014 -0700

vc4: Use cl_f() instead of cl_u32(fui())

---

 src/gallium/drivers/vc4/vc4_program.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index a836e13..98785c2 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -1304,19 +1304,19 @@ vc4_write_uniforms(struct vc4_context *vc4, struct vc4_compiled_shader *shader,
                                gallium_uniforms[uinfo->data[i]]);
                         break;
                 case QUNIFORM_VIEWPORT_X_SCALE:
-                        cl_u32(&vc4->uniforms, fui(vc4->framebuffer.width *
-                                                   16.0f / 2.0f));
+                        cl_f(&vc4->uniforms,
+                             vc4->framebuffer.width * 16.0f / 2.0f);
                         break;
                 case QUNIFORM_VIEWPORT_Y_SCALE:
-                        cl_u32(&vc4->uniforms, fui(vc4->framebuffer.height *
-                                                   -16.0f / 2.0f));
+                        cl_f(&vc4->uniforms,
+                             vc4->framebuffer.height * -16.0f / 2.0f);
                         break;
 
                 case QUNIFORM_VIEWPORT_Z_OFFSET:
-                        cl_u32(&vc4->uniforms, fui(vc4->viewport.translate[2]));
+                        cl_f(&vc4->uniforms, vc4->viewport.translate[2]);
                         break;
                 case QUNIFORM_VIEWPORT_Z_SCALE:
-                        cl_u32(&vc4->uniforms, fui(vc4->viewport.scale[2]));
+                        cl_f(&vc4->uniforms, vc4->viewport.scale[2]);
                         break;
 
                 case QUNIFORM_TEXTURE_CONFIG_P0:




More information about the mesa-commit mailing list