Mesa (master): iris: Re-emit push constants if we have a varying workgroup size

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: bbaa62e4e156012f05d2ddd9b19610d6465b62e7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bbaa62e4e156012f05d2ddd9b19610d6465b62e7

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Sep  2 13:48:51 2020 -0500

iris: Re-emit push constants if we have a varying workgroup size

Fixes: 33c61eb2f10526 "iris: Implement ARB_compute_variable_group_size"

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6570>

---

 src/gallium/drivers/iris/iris_state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 341cdbdb208..cf36dfa81d9 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6700,7 +6700,8 @@ iris_upload_gpgpu_walker(struct iris_context *ice,
    }
 
    /* TODO: Combine subgroup-id with cbuf0 so we can push regular uniforms */
-   if (stage_dirty & IRIS_STAGE_DIRTY_CS) {
+   if ((stage_dirty & IRIS_STAGE_DIRTY_CS) ||
+       cs_prog_data->local_size[0] == 0 /* Variable local group size */) {
       uint32_t curbe_data_offset = 0;
       assert(cs_prog_data->push.cross_thread.dwords == 0 &&
              cs_prog_data->push.per_thread.dwords == 1 &&