Mesa (master): vc4: Rename the 16-bit unpack #define.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 15 12:26:29 2014 -0800

vc4: Rename the 16-bit unpack #define.

It's only an f16 conversion if you're doing a float operation, otherwise
it's 16 bit signed to 32-bit signed.

---

 src/gallium/drivers/vc4/vc4_qpu_defines.h |    4 ++--
 src/gallium/drivers/vc4/vc4_qpu_disasm.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_qpu_defines.h b/src/gallium/drivers/vc4/vc4_qpu_defines.h
index 27b4efe..b2f028f 100644
--- a/src/gallium/drivers/vc4/vc4_qpu_defines.h
+++ b/src/gallium/drivers/vc4/vc4_qpu_defines.h
@@ -197,8 +197,8 @@ enum qpu_pack_a {
 
 enum qpu_unpack {
         QPU_UNPACK_NOP,
-        QPU_UNPACK_F16A_TO_F32,
-        QPU_UNPACK_F16B_TO_F32,
+        QPU_UNPACK_16A_TO_F32,
+        QPU_UNPACK_16B_TO_F32,
         QPU_UNPACK_8D_REP,
         QPU_UNPACK_8A,
         QPU_UNPACK_8B,
diff --git a/src/gallium/drivers/vc4/vc4_qpu_disasm.c b/src/gallium/drivers/vc4/vc4_qpu_disasm.c
index 65fe6dc..2511fcf 100644
--- a/src/gallium/drivers/vc4/vc4_qpu_disasm.c
+++ b/src/gallium/drivers/vc4/vc4_qpu_disasm.c
@@ -98,8 +98,8 @@ static const char *qpu_pack_mul[] = {
  */
 static const char *qpu_unpack[] = {
         [QPU_UNPACK_NOP] = "",
-        [QPU_UNPACK_F16A_TO_F32] = "f16a",
-        [QPU_UNPACK_F16B_TO_F32] = "f16b",
+        [QPU_UNPACK_16A_TO_F32] = "16a",
+        [QPU_UNPACK_16B_TO_F32] = "16b",
         [QPU_UNPACK_8D_REP] = "8d_rep",
         [QPU_UNPACK_8A] = "8a",
         [QPU_UNPACK_8B] = "8b",