From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 24 Feb 2021 23:23:43 +0000 (-0500)
Subject: zink: use slightly stricter check for update_so_info() callsite
X-Git-Tag: upstream/21.2.3~6857
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f42ff77dffc75252019884519fe5577c691d710;p=platform%2Fupstream%2Fmesa.git

zink: use slightly stricter check for update_so_info() callsite

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

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 2290501..de5ef7f 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -691,7 +691,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
    }
 
    ret->nir = nir;
-   if (so_info) {
+   if (so_info && nir->info.outputs_written && nir->info.has_transform_feedback_varyings) {
       memcpy(&ret->streamout.so_info, so_info, sizeof(struct pipe_stream_output_info));
       update_so_info(ret, so_info, nir->info.outputs_written, have_psiz);
    }