From 770d3312857a2ce2130dd949f3149d14068eb760 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Thu, 6 Aug 2020 22:31:02 -0500
Subject: [PATCH] anv: Disallow UBO pushing for bindless shaders

They don't really have push constants.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8637>
---
 src/intel/vulkan/anv_nir_compute_push_layout.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/vulkan/anv_nir_compute_push_layout.c b/src/intel/vulkan/anv_nir_compute_push_layout.c
index 3c41b1f2ae1..da19ab39740 100644
--- a/src/intel/vulkan/anv_nir_compute_push_layout.c
+++ b/src/intel/vulkan/anv_nir_compute_push_layout.c
@@ -76,7 +76,8 @@ anv_nir_compute_push_layout(const struct anv_physical_device *pdevice,
 
    const bool push_ubo_ranges =
       pdevice->info.verx10 >= 75 &&
-      has_const_ubo && nir->info.stage != MESA_SHADER_COMPUTE;
+      has_const_ubo && nir->info.stage != MESA_SHADER_COMPUTE &&
+      !brw_shader_stage_is_bindless(nir->info.stage);
 
    if (push_ubo_ranges && robust_buffer_access) {
       /* We can't on-the-fly adjust our push ranges because doing so would