Mesa (master): pan/mdg: remove ins->br_compact and ins->branch_extended

[GitLab Mirror]

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

Author: Italo Nicola <italonicola at collabora.com>
Date:   Wed Jul 29 20:37:15 2020 +0000

pan/mdg: remove ins->br_compact and ins->branch_extended

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

---

 src/panfrost/midgard/compiler.h         | 4 ----
 src/panfrost/midgard/midgard_schedule.c | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h
index f8fa09f3fda..4a318f169bb 100644
--- a/src/panfrost/midgard/compiler.h
+++ b/src/panfrost/midgard/compiler.h
@@ -184,11 +184,7 @@ typedef struct midgard_instruction {
         union {
                 midgard_load_store_word load_store;
                 midgard_texture_word texture;
-                midgard_branch_extended branch_extended;
-                uint16_t br_compact;
 
-                /* General branch, rather than packed br_compact. Higher level
-                 * than the other components */
                 midgard_branch branch;
         };
 } midgard_instruction;
diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c
index cee0271718f..3391e5360b2 100644
--- a/src/panfrost/midgard/midgard_schedule.c
+++ b/src/panfrost/midgard/midgard_schedule.c
@@ -225,7 +225,7 @@ bytes_for_instruction(midgard_instruction *ains)
         else if (ains->unit == ALU_ENAB_BRANCH)
                 return sizeof(midgard_branch_extended);
         else if (ains->compact_branch)
-                return sizeof(ains->br_compact);
+                return sizeof(uint16_t);
         else
                 return sizeof(midgard_reg_info) + sizeof(midgard_scalar_alu);
 }