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

pan/bi: Add support for tex offsets 

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/7530>
This commit is contained in:
Boris Brezillon 2020-11-09 12:21:03 +01:00
parent ed057ca3d7
commit 54a965b153
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1588,21 +1588,47 @@ bi_emit_tex_offset_ms_index(bi_context *ctx, nir_tex_instr *instr)
{ {
unsigned dest = 0; unsigned dest = 0;
/* TODO: offsets */ int offs_idx = nir_tex_instr_src_index(instr, nir_tex_src_offset);
assert(nir_tex_instr_src_index(instr, nir_tex_src_offset) < 0); if (offs_idx >= 0 &&
(!nir_src_is_const(instr->src[offs_idx].src) ||
nir_src_as_uint(instr->src[offs_idx].src) != 0)) {
bi_instruction mkvec = {
.type = BI_SELECT,
.dest = bi_make_temp(ctx),
.dest_type = nir_type_uint32,
.src = {
BIR_INDEX_ZERO, BIR_INDEX_ZERO,
BIR_INDEX_ZERO, BIR_INDEX_ZERO
},
.src_types = {
nir_type_uint8, nir_type_uint8,
nir_type_uint8, nir_type_uint8
}
};
unsigned ncomps = nir_src_num_components(instr->src[offs_idx].src);
unsigned src = pan_src_index(&instr->src[offs_idx].src);
for (unsigned i = 0; i < ncomps; i++) {
mkvec.src[i] = src;
mkvec.swizzle[i][0] = i * 4;
}
bi_emit(ctx, mkvec);
dest = mkvec.dest;
}
int ms_idx = nir_tex_instr_src_index(instr, nir_tex_src_ms_index); int ms_idx = nir_tex_instr_src_index(instr, nir_tex_src_ms_index);
if (ms_idx >= 0 && if (ms_idx >= 0 &&
(!nir_src_is_const(instr->src[ms_idx].src) || (!nir_src_is_const(instr->src[ms_idx].src) ||
nir_src_as_uint(instr->src[ms_idx].src) != 0)) { nir_src_as_uint(instr->src[ms_idx].src) != 0)) {
bi_instruction shl = { bi_instruction or = {
.type = BI_BITWISE, .type = BI_BITWISE,
.op.bitwise = BI_BITWISE_OR, .op.bitwise = BI_BITWISE_OR,
.dest = bi_make_temp(ctx), .dest = bi_make_temp(ctx),
.dest_type = nir_type_uint32, .dest_type = nir_type_uint32,
.src = { .src = {
pan_src_index(&instr->src[ms_idx].src), pan_src_index(&instr->src[ms_idx].src),
BIR_INDEX_ZERO, dest ? dest : BIR_INDEX_ZERO,
BIR_INDEX_CONSTANT | 0, BIR_INDEX_CONSTANT | 0,
}, },
.src_types = { .src_types = {
@ -1613,8 +1639,8 @@ bi_emit_tex_offset_ms_index(bi_context *ctx, nir_tex_instr *instr)
.constant.u8[0] = 24, .constant.u8[0] = 24,
}; };
bi_emit(ctx, shl); bi_emit(ctx, or);
dest = shl.dest; dest = or.dest;
} }
return dest; return dest;