OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/bi: Rework blend descriptor access handling

Browse Source 
The current logic assumes blend descriptors are always retrieved from
the blend descriptor slots present in the FAU RAM, but this assumption
no longer stands when we add blend shaders to the mix. In that case we
need to use an 'opaque blend' whose descriptor is passed through
embedded constants.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7151>
This commit is contained in:
Boris Brezillon
2020-10-12 11:19:45 +02:00
parent 6dd2a76126
commit 16179c89d1
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/panfrost/bifrost/bi_pack.c
View File

@@ -124,12 +124,6 @@ bi_assign_fau_idx_single(bi_registers *regs,
if (!ins)
return assigned;
if (ins->type == BI_BLEND) {
assert(!assigned);
regs->fau_idx = 0x8;
return true;
}
if (ins->type == BI_BRANCH && clause->branch_constant) {
/* By convention branch constant is last */
unsigned idx = clause->constant_count - 1;
@@ -186,6 +180,18 @@ bi_assign_fau_idx_single(bi_registers *regs,
assigned = true;
} else if (ins->src[s] & BIR_INDEX_ZERO && fast_zero) {
ins->src[s] = BIR_INDEX_PASS | BIFROST_SRC_STAGE;
} else if (ins->src[s] & BIR_INDEX_BLEND) {
unsigned rt = ins->blend_location;
assert(rt <= 7);
assert((ins->src[s] & ~BIR_SPECIAL) == BIFROST_SRC_FAU_HI ||
(ins->src[s] & ~BIR_SPECIAL) == BIFROST_SRC_FAU_LO);
ins->src[s] = BIR_INDEX_PASS | (ins->src[s] & ~BIR_SPECIAL);
if (assigned && regs->fau_idx != (8 | rt))
unreachable("Mismatched FAU index");
regs->fau_idx = 8 | rt;
assigned = true;
} else if (s & BIR_INDEX_UNIFORM) {
unreachable("Push uniforms not implemented yet");
}

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

@@ -158,8 +158,8 @@ bi_emit_frag_out(bi_context *ctx, nir_intrinsic_instr *instr)
pan_src_index(&instr->src[0]),
BIR_INDEX_REGISTER | 60 /* Can this be arbitrary? */,
/* Blend descriptor */
BIR_INDEX_PASS | BIFROST_SRC_FAU_LO,
BIR_INDEX_PASS | BIFROST_SRC_FAU_HI,
BIR_INDEX_BLEND | BIFROST_SRC_FAU_LO,
BIR_INDEX_BLEND | BIFROST_SRC_FAU_HI,
},
.src_types = {
nir_intrinsic_src_type(instr),

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

@@ -514,11 +514,13 @@ bi_remove_instruction(bi_instruction *ins)
#define BIR_INDEX_CONSTANT (1 << 29)
#define BIR_INDEX_ZERO (1 << 28)
#define BIR_INDEX_PASS (1 << 27)
#define BIR_INDEX_BLEND (1 << 26)
/* Keep me synced please so we can check src & BIR_SPECIAL */
#define BIR_SPECIAL ((BIR_INDEX_REGISTER | BIR_INDEX_UNIFORM) | \
(BIR_INDEX_CONSTANT | BIR_INDEX_ZERO | BIR_INDEX_PASS))
#define BIR_SPECIAL (BIR_INDEX_REGISTER | BIR_INDEX_UNIFORM | \
BIR_INDEX_CONSTANT | BIR_INDEX_ZERO | \
BIR_INDEX_PASS | BIR_INDEX_BLEND)
static inline unsigned
bi_max_temp(bi_context *ctx)