diff --git a/.pick_status.json b/.pick_status.json
index e862ed4fb12..95b165dc9b7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -234,7 +234,7 @@
"description": "etnaviv: isa: Support src2 for texld",
"nominated": true,
"nomination_type": 2,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "abe5bd35d0bcd10ff08c4dd0239ab1fbeea3db49",
"notes": null
diff --git a/src/etnaviv/isa/etnaviv.xml b/src/etnaviv/isa/etnaviv.xml
index 6c97eb6869b..a14e7d49dd1 100644
--- a/src/etnaviv/isa/etnaviv.xml
+++ b/src/etnaviv/isa/etnaviv.xml
@@ -368,6 +368,10 @@ SPDX-License-Identifier: MIT
({SRC0_USE} != 0) && ({SRC1_USE} != 0)
+
+ ({SRC2_USE} != 0)
+
+
Needed for texkill
@@ -695,13 +699,19 @@ SPDX-License-Identifier: MIT
0
-
+
{INSTR_TEX} {DST:align=18}, tex{TEX_ID}{TEX_SWIZ}, {SRC0}, void, void
+
+
+ {INSTR_TEX} {DST:align=18}, tex{TEX_ID}{TEX_SWIZ}, {SRC0}, void, {SRC2}
+
+
+
1
@@ -723,13 +733,15 @@ SPDX-License-Identifier: MIT
000
- 0
- 000000000
- 00000000
- 0
- 0
- 000
- 000
+
+
+
+
+
+
+
+
+
@@ -1180,7 +1192,7 @@ SPDX-License-Identifier: MIT
0
-
+
011000
0
diff --git a/src/etnaviv/isa/tests/disasm.cpp b/src/etnaviv/isa/tests/disasm.cpp
index 55de2e3ce4e..dc0a26a4913 100644
--- a/src/etnaviv/isa/tests/disasm.cpp
+++ b/src/etnaviv/isa/tests/disasm.cpp
@@ -373,3 +373,11 @@ INSTANTIATE_TEST_SUITE_P(ConvVariants, DisasmTest,
)
);
// clang-format on
+
+// clang-format off
+INSTANTIATE_TEST_SUITE_P(ShadowSampler, DisasmTest,
+ testing::Values(
+ disasm_state{ {0x00811018, 0x15001800, 0x00000000, 0x002a8018}, "texld t1.x___, tex0.xxxx, t1.xyyy, void, t1.zzzz\n", FLAG_FAILING_PARSE | FLAG_FAILING_ASM}
+ )
+);
+// clang-format on