Mesa (master): llvmpipe: fix no tokens detections.

[GitLab Mirror]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Apr  8 15:44:15 2020 +1000

llvmpipe: fix no tokens detections.

this only applies to the TGSI path, fixes
KHR-GLES31.core.geometry_shader.api.program_pipeline_vs_gs_capture

Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4560>

---

 src/gallium/drivers/llvmpipe/lp_state_gs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_state_gs.c b/src/gallium/drivers/llvmpipe/lp_state_gs.c
index b2a918ca957..302d599024d 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_gs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_gs.c
@@ -57,7 +57,10 @@ llvmpipe_create_gs_state(struct pipe_context *pipe,
    }
 
    /* copy stream output info */
-   state->no_tokens = !templ->tokens;
+   if (templ->type == PIPE_SHADER_IR_TGSI)
+      state->no_tokens = !templ->tokens;
+   else
+      state->no_tokens = FALSE;
    memcpy(&state->stream_output, &templ->stream_output, sizeof state->stream_output);
 
    if (templ->tokens || templ->type == PIPE_SHADER_IR_NIR) {