Mesa (master): pan/bi: Disassemble f16 dual tex

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Tue Apr 21 12:48:01 2020 -0400

pan/bi: Disassemble f16 dual tex

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4671>

---

 src/panfrost/bifrost/disassemble.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/panfrost/bifrost/disassemble.c b/src/panfrost/bifrost/disassemble.c
index bdf4ced3ae6..bd97add3f7d 100644
--- a/src/panfrost/bifrost/disassemble.c
+++ b/src/panfrost/bifrost/disassemble.c
@@ -1420,12 +1420,15 @@ static void dump_add(FILE *fp, uint64_t word, struct bifrost_regs regs,
                          * textures/samplers. Observed for the compact
                          * (2D/normal) case. */
 
-                        if (ctrl.result_type == 9) {
+                        if ((ctrl.result_type & 7) == 1) {
+                                bool f32 = ctrl.result_type & 8;
+
                                 struct bifrost_dual_tex_ctrl dualCtrl;
                                 memcpy((char *) &dualCtrl, (char *) &controlBits, sizeof(ctrl));
-                                fprintf(fp, "(dualtex) tex0:%d samp0:%d tex1:%d samp1:%d ",
+                                fprintf(fp, "(dualtex) tex0:%d samp0:%d tex1:%d samp1:%d %s",
                                        dualCtrl.tex_index0, dualCtrl.sampler_index0,
-                                       dualCtrl.tex_index1, dualCtrl.sampler_index1);
+                                       dualCtrl.tex_index1, dualCtrl.sampler_index1,
+                                       f32 ? "f32" : "f16");
                                 if (dualCtrl.unk0 != 3)
                                         fprintf(fp, "unk:%d ", dualCtrl.unk0);
                                 dualTex = true;