From 3797fc9af96f63a43ce544b674bd054d88782487 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 27 Nov 2020 10:43:06 -0500 Subject: [PATCH] pan/bi: Use canonical sample names Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_print.h | 2 +- src/panfrost/bifrost/bi_print_common.c | 10 +++++----- src/panfrost/bifrost/bi_print_common.h | 2 +- src/panfrost/bifrost/bifrost.h | 12 ++++++------ src/panfrost/bifrost/bifrost_compile.c | 14 +++++++------- src/panfrost/bifrost/compiler.h | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/panfrost/bifrost/bi_print.h b/src/panfrost/bifrost/bi_print.h index b19dd3a8457..4987330a9f9 100644 --- a/src/panfrost/bifrost/bi_print.h +++ b/src/panfrost/bifrost/bi_print.h @@ -35,7 +35,7 @@ const char * bi_message_type_name(enum bifrost_message_type T); const char * bi_output_mod_name(enum bi_clamp mod); const char * bi_minmax_mode_name(enum bifrost_minmax_mode mod); const char * bi_round_mode_name(enum bi_round mod); -const char * bi_interp_mode_name(enum bifrost_interp_mode mode); +const char * bi_interp_mode_name(enum bi_sample mode); const char * bi_class_name(enum bi_class cl); const char * bi_cond_name(enum bi_cond cond); const char * bi_special_op_name(enum bi_special_op op); diff --git a/src/panfrost/bifrost/bi_print_common.c b/src/panfrost/bifrost/bi_print_common.c index c64342c47cb..8a6ef76dd53 100644 --- a/src/panfrost/bifrost/bi_print_common.c +++ b/src/panfrost/bifrost/bi_print_common.c @@ -88,13 +88,13 @@ bi_round_mode_name(enum bi_round mod) } const char * -bi_interp_mode_name(enum bifrost_interp_mode mode) +bi_interp_mode_name(enum bi_sample mode) { switch (mode) { - case BIFROST_INTERP_CENTER: return ".center"; - case BIFROST_INTERP_CENTROID: return ".centroid"; - case BIFROST_INTERP_SAMPLE: return ".sample"; - case BIFROST_INTERP_EXPLICIT: return ".explicit"; + case BI_SAMPLE_CENTER: return ".center"; + case BI_SAMPLE_CENTROID: return ".centroid"; + case BI_SAMPLE_SAMPLE: return ".sample"; + case BI_SAMPLE_EXPLICIT: return ".explicit"; default: return ".unknown"; } } diff --git a/src/panfrost/bifrost/bi_print_common.h b/src/panfrost/bifrost/bi_print_common.h index daec5432416..f263bb27d93 100644 --- a/src/panfrost/bifrost/bi_print_common.h +++ b/src/panfrost/bifrost/bi_print_common.h @@ -34,7 +34,7 @@ const char * bi_message_type_name(enum bifrost_message_type T); const char * bi_output_mod_name(enum bi_clamp mod); const char * bi_minmax_mode_name(enum bifrost_minmax_mode mod); const char * bi_round_mode_name(enum bi_round mod); -const char * bi_interp_mode_name(enum bifrost_interp_mode mode); +const char * bi_interp_mode_name(enum bi_sample mode); const char * bi_flow_control_name(enum bifrost_flow mode); #endif diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h index aad9eef6103..91796efe3b4 100644 --- a/src/panfrost/bifrost/bifrost.h +++ b/src/panfrost/bifrost/bifrost.h @@ -222,12 +222,12 @@ enum bifrost_minmax_mode { BIFROST_SRC0_WINS = 0x3, }; -enum bifrost_interp_mode { - BIFROST_INTERP_CENTER = 0x0, - BIFROST_INTERP_CENTROID = 0x1, - BIFROST_INTERP_SAMPLE = 0x2, - BIFROST_INTERP_EXPLICIT = 0x3, - BIFROST_INTERP_NONE = 0x4, +enum bi_sample { + BI_SAMPLE_CENTER = 0x0, + BI_SAMPLE_CENTROID = 0x1, + BI_SAMPLE_SAMPLE = 0x2, + BI_SAMPLE_EXPLICIT = 0x3, + BI_SAMPLE_NONE = 0x4, }; enum bifrost_update_mode { diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 1b9bd6ebb15..5092300ffc7 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -150,17 +150,17 @@ bi_emit_ld_output(bi_context *ctx, nir_intrinsic_instr *instr) bi_emit(ctx, ins); } -static enum bifrost_interp_mode +static enum bi_sample bi_interp_for_intrinsic(nir_intrinsic_op op) { switch (op) { case nir_intrinsic_load_barycentric_centroid: - return BIFROST_INTERP_CENTROID; + return BI_SAMPLE_CENTROID; case nir_intrinsic_load_barycentric_sample: - return BIFROST_INTERP_SAMPLE; + return BI_SAMPLE_SAMPLE; case nir_intrinsic_load_barycentric_pixel: default: - return BIFROST_INTERP_CENTER; + return BI_SAMPLE_CENTER; } } @@ -170,7 +170,7 @@ bi_emit_ld_vary(bi_context *ctx, nir_intrinsic_instr *instr) bi_instruction ins = { .type = BI_LOAD_VAR, .load_vary = { - .interp_mode = BIFROST_INTERP_CENTER, + .interp_mode = BI_SAMPLE_CENTER, .update_mode = BIFROST_UPDATE_STORE, .reuse = false, .flat = instr->intrinsic != nir_intrinsic_load_interpolated_input, @@ -189,7 +189,7 @@ bi_emit_ld_vary(bi_context *ctx, nir_intrinsic_instr *instr) } } - if (ins.load_vary.interp_mode == BIFROST_INTERP_CENTER) { + if (ins.load_vary.interp_mode == BI_SAMPLE_CENTER) { /* Zero it out for center interpolation */ ins.src[0] = BIR_INDEX_ZERO; } else { @@ -608,7 +608,7 @@ bi_emit_ld_frag_coord(bi_context *ctx, nir_intrinsic_instr *instr) bi_instruction load = { .type = BI_LOAD_VAR, .load_vary = { - .interp_mode = BIFROST_INTERP_CENTER, + .interp_mode = BI_SAMPLE_CENTER, .update_mode = BIFROST_UPDATE_CLOBBER, .var_id = (i == 0) ? BI_VARYING_NAME_FRAG_Z : diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h index 437adb9adee..b0ac4af5ff7 100644 --- a/src/panfrost/bifrost/compiler.h +++ b/src/panfrost/bifrost/compiler.h @@ -133,7 +133,7 @@ extern unsigned bi_class_props[BI_NUM_CLASSES]; /* BI_LD_VARY */ struct bi_load_vary { - enum bifrost_interp_mode interp_mode; + enum bi_sample interp_mode; enum bifrost_update_mode update_mode; enum bi_varying_name var_id; unsigned index;