Mesa (staging/22.1): anv: disable non uniform indexing of UBOs

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 2a453ba93f2e8529af70666386a6e4bc60ee704f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a453ba93f2e8529af70666386a6e4bc60ee704f

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Jun 23 10:33:33 2022 +0300

anv: disable non uniform indexing of UBOs

The feature we wanted to enable in 710393b3aa4a was
descriptorBindingUniformBufferUpdateAfterBind.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 710393b3aa4a ("anv: enable UBO indexing")
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17200>
(cherry picked from commit 3e247cd05f30b963027bd5e9ffcadf2cfa27ff5b)

---

 .pick_status.json             | 2 +-
 src/intel/vulkan/anv_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a0f43797cc6..701ddcc928a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -283,7 +283,7 @@
         "description": "anv: disable non uniform indexing of UBOs",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "710393b3aa4a99d446db0c41ef23eb44332332b4"
     },
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 18eb87bdd63..3d542b6a1e9 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -1387,7 +1387,7 @@ anv_get_physical_device_features_1_2(struct anv_physical_device *pdevice,
    f->shaderInputAttachmentArrayDynamicIndexing          = false;
    f->shaderUniformTexelBufferArrayDynamicIndexing       = descIndexing;
    f->shaderStorageTexelBufferArrayDynamicIndexing       = descIndexing;
-   f->shaderUniformBufferArrayNonUniformIndexing         = descIndexing;
+   f->shaderUniformBufferArrayNonUniformIndexing         = false;
    f->shaderSampledImageArrayNonUniformIndexing          = descIndexing;
    f->shaderStorageBufferArrayNonUniformIndexing         = descIndexing;
    f->shaderStorageImageArrayNonUniformIndexing          = descIndexing;