From bb21160a19b18a3ce4cae9fcac1e3cd901cc92d8 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sat, 20 May 2023 13:46:50 -0400
Subject: [PATCH] agx: Pack bindless textures

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24258>
---
 src/asahi/compiler/agx_pack.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/asahi/compiler/agx_pack.c b/src/asahi/compiler/agx_pack.c
index f48fc1236cd..59563e84770 100644
--- a/src/asahi/compiler/agx_pack.c
+++ b/src/asahi/compiler/agx_pack.c
@@ -50,16 +50,28 @@ static unsigned
 agx_pack_texture(agx_index base, agx_index index, unsigned *packed_base,
                  unsigned *flag)
 {
-   assert(base.type == AGX_INDEX_IMMEDIATE && base.value == 0 &&
-          "TODO: bindless");
-   *packed_base = 0;
+   if (base.type == AGX_INDEX_IMMEDIATE) {
+      assert(base.value == 0);
 
-   if (index.type == AGX_INDEX_REGISTER) {
-      assert(index.size == AGX_SIZE_16);
-      *flag = 1;
+      /* Texture state registers */
+      *packed_base = 0;
+
+      if (index.type == AGX_INDEX_REGISTER) {
+         assert(index.size == AGX_SIZE_16);
+         *flag = 1;
+      } else {
+         assert(index.type == AGX_INDEX_IMMEDIATE);
+         *flag = 0;
+      }
    } else {
-      assert(index.type == AGX_INDEX_IMMEDIATE);
-      *flag = 0;
+      assert(base.type == AGX_INDEX_UNIFORM);
+      assert(base.size == AGX_SIZE_64);
+      assert((base.value & 3) == 0);
+      assert(index.size == AGX_SIZE_32);
+
+      /* Bindless */
+      *packed_base = base.value >> 2;
+      *flag = 3;
    }
 
    return index.value;