pan/bi: Use canonical update modes

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

diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index ab01e37..0f3f14e 100644 (file)
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -259,10 +259,10 @@ bi_print_load_vary(struct bi_load_vary *load, FILE *fp)
                 fprintf(fp, ".imm(%d)", load->index);
 
         switch (load->update_mode) {
-        case BIFROST_UPDATE_STORE: fprintf(fp, ".store"); break;
-        case BIFROST_UPDATE_RETRIEVE: fprintf(fp, ".retrieve"); break;
-        case BIFROST_UPDATE_CONDITIONAL: fprintf(fp, ".conditional"); break;
-        case BIFROST_UPDATE_CLOBBER: fprintf(fp, ".clobber"); break;
+        case BI_UPDATE_STORE: fprintf(fp, ".store"); break;
+        case BI_UPDATE_RETRIEVE: fprintf(fp, ".retrieve"); break;
+        case BI_UPDATE_CONDITIONAL: fprintf(fp, ".conditional"); break;
+        case BI_UPDATE_CLOBBER: fprintf(fp, ".clobber"); break;
         default: unreachable("Invalid update mode");
         }
 }

diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index 91796ef..22e75ff 100644 (file)
--- a/src/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
@@ -230,11 +230,11 @@ enum bi_sample {
         BI_SAMPLE_NONE = 0x4,
 };
 
-enum bifrost_update_mode {
-        BIFROST_UPDATE_STORE,
-        BIFROST_UPDATE_RETRIEVE,
-        BIFROST_UPDATE_CONDITIONAL,
-        BIFROST_UPDATE_CLOBBER,
+enum bi_update {
+        BI_UPDATE_STORE,
+        BI_UPDATE_RETRIEVE,
+        BI_UPDATE_CONDITIONAL,
+        BI_UPDATE_CLOBBER,
 };
 
 /* Fixed location for gl_FragCoord.zw */

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 5092300..9030818 100644 (file)
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -171,7 +171,7 @@ bi_emit_ld_vary(bi_context *ctx, nir_intrinsic_instr *instr)
                 .type = BI_LOAD_VAR,
                 .load_vary = {
                         .interp_mode = BI_SAMPLE_CENTER,
-                        .update_mode = BIFROST_UPDATE_STORE,
+                        .update_mode = BI_UPDATE_STORE,
                         .reuse = false,
                         .flat = instr->intrinsic != nir_intrinsic_load_interpolated_input,
                 },
@@ -609,7 +609,7 @@ bi_emit_ld_frag_coord(bi_context *ctx, nir_intrinsic_instr *instr)
                         .type = BI_LOAD_VAR,
                         .load_vary = {
                                 .interp_mode = BI_SAMPLE_CENTER,
-                                .update_mode = BIFROST_UPDATE_CLOBBER,
+                                .update_mode = BI_UPDATE_CLOBBER,
                                 .var_id = (i == 0) ?
                                           BI_VARYING_NAME_FRAG_Z :
                                           BI_VARYING_NAME_FRAG_W,
@@ -766,7 +766,7 @@ bi_emit_point_coord(bi_context *ctx, nir_intrinsic_instr *instr)
         bi_instruction ins = {
                 .type = BI_LOAD_VAR,
                 .load_vary = {
-                        .update_mode = BIFROST_UPDATE_CLOBBER,
+                        .update_mode = BI_UPDATE_CLOBBER,
                         .var_id = BI_VARYING_NAME_POINT,
                         .special = true,
                 },

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index b0ac4af..2c1e65d 100644 (file)
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -134,7 +134,7 @@ extern unsigned bi_class_props[BI_NUM_CLASSES];
 /* BI_LD_VARY */
 struct bi_load_vary {
         enum bi_sample interp_mode;
-        enum bifrost_update_mode update_mode;
+        enum bi_update update_mode;
         enum bi_varying_name var_id;
         unsigned index;
         bool immediate;