Mesa (main): ir3/freedreno: handle non-uniform a1en instructions

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4218596671401f254cf41c1e9715bf8c3b74a0f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4218596671401f254cf41c1e9715bf8c3b74a0f6

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Tue Oct 12 17:14:21 2021 +0300

ir3/freedreno: handle non-uniform a1en instructions

Fixes vkd3d test "test_bindless_samplers_sm51"

Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13311>

---

 src/freedreno/isa/encode.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/isa/encode.c b/src/freedreno/isa/encode.c
index e5e7d9b04a7..cbd7ef68e32 100644
--- a/src/freedreno/isa/encode.c
+++ b/src/freedreno/isa/encode.c
@@ -179,7 +179,11 @@ extract_cat5_DESC_MODE(struct ir3_instruction *instr)
 	if (instr->flags & IR3_INSTR_S2EN) {
 		if (instr->flags & IR3_INSTR_B) {
 			if (instr->flags & IR3_INSTR_A1EN) {
-				return CAT5_BINDLESS_A1_UNIFORM;
+				if (instr->flags & IR3_INSTR_NONUNIF) {
+					return CAT5_BINDLESS_A1_NONUNIFORM;
+				} else {
+					return CAT5_BINDLESS_A1_UNIFORM;
+				}
 			} else if (instr->flags & IR3_INSTR_NONUNIF) {
 				return CAT5_BINDLESS_NONUNIFORM;
 			} else {