Mesa (master): zink: fix streamout for clipdistance

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Jan 24 02:27:16 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Sat Jan 23 16:21:36 2021 -0500

zink: fix streamout for clipdistance

the assert added here during review broke this since clipdistance is 8 components

Fixes: 9eec52c67e6 ("zink: tweak xfb slot mapping in ntv")

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8673>

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 2fb7babb023..396932acbe9 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -1249,7 +1249,7 @@ emit_so_outputs(struct ntv_context *ctx,
       while (!output)
          output = ctx->outputs[location--];
       location++;
-      assert(orig_location - location < 4);
+      assert(orig_location - location < 8);
       SpvId output_type = ctx->so_output_types[location];
       const struct glsl_type *out_type = ctx->so_output_gl_types[location];
 



More information about the mesa-commit mailing list