Mesa (master): iris: Always re-upload sysvals when we have kernel inputs

[GitLab Mirror]

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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Thu Aug 20 23:47:51 2020 -0500

iris: Always re-upload sysvals when we have kernel inputs

They can change on every dispatch and clover never gives us a heads up.

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

---

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

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 7d9ac074988..04053e2daad 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -6814,8 +6814,9 @@ iris_upload_compute_state(struct iris_context *ice,
     */
    iris_use_pinned_bo(batch, ice->state.binder.bo, false, IRIS_DOMAIN_NONE);
 
-   if ((stage_dirty & IRIS_STAGE_DIRTY_CONSTANTS_CS) &&
-       shs->sysvals_need_upload)
+   if (((stage_dirty & IRIS_STAGE_DIRTY_CONSTANTS_CS) &&
+        shs->sysvals_need_upload) ||
+       shader->kernel_input_size > 0)
       upload_sysvals(ice, MESA_SHADER_COMPUTE, grid);
 
    if (stage_dirty & IRIS_STAGE_DIRTY_BINDINGS_CS)