Mesa (master): vc4: Consistently use qir_uniform_f().

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


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

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

vc4: Consistently use qir_uniform_f().

---

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

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index e99abc6..a836e13 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -568,11 +568,10 @@ emit_vertex_input(struct tgsi_to_qir *trans, int attr)
                         }
                         /* FALLTHROUGH */
                 case UTIL_FORMAT_SWIZZLE_0:
-                        trans->inputs[attr * 4 + i] = qir_uniform_ui(trans, 0);
+                        trans->inputs[attr * 4 + i] = qir_uniform_f(trans, 0.0);
                         break;
                 case UTIL_FORMAT_SWIZZLE_1:
-                        trans->inputs[attr * 4 + i] = qir_uniform_ui(trans,
-                                                                     fui(1.0));
+                        trans->inputs[attr * 4 + i] = qir_uniform_f(trans, 1.0);
                         break;
                 default:
                         if (!format_warned &&
@@ -779,13 +778,13 @@ emit_frag_end(struct tgsi_to_qir *trans)
          */
         if (0) {
                 trans->outputs[format_desc->swizzle[0]] =
-                        qir_uniform_ui(trans, fui(1.0));
+                        qir_uniform_f(trans, 1.0);
                 trans->outputs[format_desc->swizzle[1]] =
-                        qir_uniform_ui(trans, fui(0.0));
+                        qir_uniform_f(trans, 0.0);
                 trans->outputs[format_desc->swizzle[2]] =
-                        qir_uniform_ui(trans, fui(1.0));
+                        qir_uniform_f(trans, 1.0);
                 trans->outputs[format_desc->swizzle[3]] =
-                        qir_uniform_ui(trans, fui(0.5));
+                        qir_uniform_f(trans, 0.5);
         }
 
         struct qreg swizzled_outputs[4] = {




More information about the mesa-commit mailing list