aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <[email protected]>2020-05-27 11:43:37 -0400
committerAlyssa Rosenzweig <[email protected]>2020-05-27 16:49:44 -0400
commit6650fa22c79dca1264b8f77f83bba3ccbb0298b9 (patch)
tree5da2d43e8f7400cb9547868ea94790a101a827b2
parent731dfc6066dac8da477ba02ad90d5f2145fa0811 (diff)
pan/bi: Add f16 TEXC.vtx op
Signed-off-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5232>
-rw-r--r--src/panfrost/bifrost/bifrost_compile.c5
-rw-r--r--src/panfrost/bifrost/disassemble.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 417c6de7b06..09bec283dc2 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -883,6 +883,11 @@ emit_tex_compact(bi_context *ctx, nir_tex_instr *instr)
for (unsigned i = 0; i < instr->num_srcs; ++i) {
int index = pan_src_index(&instr->src[i].src);
+
+ /* We were checked ahead-of-time */
+ if (instr->src[i].src_type == nir_tex_src_lod)
+ continue;
+
assert (instr->src[i].src_type == nir_tex_src_coord);
tex.src[0] = index;
diff --git a/src/panfrost/bifrost/disassemble.c b/src/panfrost/bifrost/disassemble.c
index debc710b3be..e5f23eb0a6f 100644
--- a/src/panfrost/bifrost/disassemble.c
+++ b/src/panfrost/bifrost/disassemble.c
@@ -1130,7 +1130,8 @@ static const struct add_op_info add_op_infos[] = {
{ 0x1a000, "LD_VAR.16", ADD_VARYING_INTERP, true },
{ 0x1ae20, "TEX.vtx", ADD_TEX, true },
{ 0x1ae60, "TEX", ADD_TEX, true },
- { 0x1b000, "TEX.f16", ADD_TEX_COMPACT, true },
+ { 0x1b000, "TEXC.f16", ADD_TEX_COMPACT, true },
+ { 0x1b400, "TEXC.vtx.f16", ADD_TEX_COMPACT, true },
{ 0x1c000, "RSHIFT_NAND.i32", ADD_SHIFT },
{ 0x1c400, "RSHIFT_AND.i32", ADD_SHIFT },
{ 0x1c800, "LSHIFT_NAND.i32", ADD_SHIFT },