KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pan/bi: Use canonical varying names 

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8213>
This commit is contained in:
Alyssa Rosenzweig 2020-11-27 10:41:47 -05:00 committed by Marge Bot
parent 030854a3b8
commit 2e84a1b4d8
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/panfrost/bifrost/bi_print.c
View File

@ -242,9 +242,9 @@ bi_print_load_vary(struct bi_load_vary *load, FILE *fp)
if (load->special) { if (load->special) {
switch (load->var_id) { switch (load->var_id) {
case BIFROST_SPECIAL_VAR_POINT: fprintf(fp, ".point"); break; case BI_VARYING_NAME_POINT: fprintf(fp, ".point"); break;
case BIFROST_SPECIAL_VAR_FRAGZ: fprintf(fp, ".fragz"); break; case BI_VARYING_NAME_FRAG_Z: fprintf(fp, ".fragz"); break;
case BIFROST_SPECIAL_VAR_FRAGW: fprintf(fp, ".fragw"); break; case BI_VARYING_NAME_FRAG_W: fprintf(fp, ".fragw"); break;
default: unreachable("Invalid varying ID"); default: unreachable("Invalid varying ID");
} }
} }

2
src/panfrost/bifrost/bi_schedule.c
View File

@ -32,7 +32,7 @@ static bool
bi_is_fragz(bi_instruction *ins) bi_is_fragz(bi_instruction *ins)
{ {
return ins->load_vary.special && return ins->load_vary.special &&
ins->load_vary.var_id == BIFROST_SPECIAL_VAR_FRAGZ; ins->load_vary.var_id == BI_VARYING_NAME_FRAG_Z;
} }
static enum bifrost_message_type static enum bifrost_message_type

8
src/panfrost/bifrost/bifrost.h
View File

@ -238,10 +238,10 @@ enum bifrost_update_mode {
}; };
/* Fixed location for gl_FragCoord.zw */ /* Fixed location for gl_FragCoord.zw */
enum bifrost_special_var_id { enum bi_varying_name {
BIFROST_SPECIAL_VAR_POINT = 0, BI_VARYING_NAME_POINT = 0,
BIFROST_SPECIAL_VAR_FRAGW = 2, BI_VARYING_NAME_FRAG_W = 2,
BIFROST_SPECIAL_VAR_FRAGZ = 3, BI_VARYING_NAME_FRAG_Z = 3,
}; };
enum branch_bit_size { enum branch_bit_size {

6
src/panfrost/bifrost/bifrost_compile.c
View File

@ -611,8 +611,8 @@ bi_emit_ld_frag_coord(bi_context *ctx, nir_intrinsic_instr *instr)
.interp_mode = BIFROST_INTERP_CENTER, .interp_mode = BIFROST_INTERP_CENTER,
.update_mode = BIFROST_UPDATE_CLOBBER, .update_mode = BIFROST_UPDATE_CLOBBER,
.var_id = (i == 0) ? .var_id = (i == 0) ?
BIFROST_SPECIAL_VAR_FRAGZ : BI_VARYING_NAME_FRAG_Z :
BIFROST_SPECIAL_VAR_FRAGW, BI_VARYING_NAME_FRAG_W,
.special = true, .special = true,
.reuse = false, .reuse = false,
.flat = true .flat = true
@ -767,7 +767,7 @@ bi_emit_point_coord(bi_context *ctx, nir_intrinsic_instr *instr)
.type = BI_LOAD_VAR, .type = BI_LOAD_VAR,
.load_vary = { .load_vary = {
.update_mode = BIFROST_UPDATE_CLOBBER, .update_mode = BIFROST_UPDATE_CLOBBER,
.var_id = BIFROST_SPECIAL_VAR_POINT, .var_id = BI_VARYING_NAME_POINT,
.special = true, .special = true,
}, },
.vector_channels = 2, .vector_channels = 2,

2
src/panfrost/bifrost/compiler.h
View File

@ -135,7 +135,7 @@ extern unsigned bi_class_props[BI_NUM_CLASSES];
struct bi_load_vary { struct bi_load_vary {
enum bifrost_interp_mode interp_mode; enum bifrost_interp_mode interp_mode;
enum bifrost_update_mode update_mode; enum bifrost_update_mode update_mode;
enum bifrost_special_var_id var_id; enum bi_varying_name var_id;
unsigned index; unsigned index;
bool immediate; bool immediate;
bool special; bool special;