From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 11 Dec 2020 01:03:50 +0000 (-0500)
Subject: draw: fix incorrect NIR support code
X-Git-Tag: upstream/21.0.0~1253
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c92df435d8c2df79685f1241713f25a94ad44b7;p=platform%2Fupstream%2Fmesa.git

draw: fix incorrect NIR support code

"state" contains NIR, while "vs->base.state" contains TGSI generated
from NIR. It was a typo.

This fixes the arb_vp subtest of: DRAW_USE_LLVM=1 piglit/bin/rasterpos

Fixes: df11ceaaaf7 - draw: add NIR support to draw_create_vertex_shader

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8046>
---

diff --git a/src/gallium/auxiliary/draw/draw_vs_exec.c b/src/gallium/auxiliary/draw/draw_vs_exec.c
index 17800ad..95e2e96 100644
--- a/src/gallium/auxiliary/draw/draw_vs_exec.c
+++ b/src/gallium/auxiliary/draw/draw_vs_exec.c
@@ -240,7 +240,7 @@ draw_create_vs_exec(struct draw_context *draw,
       }
    }
 
-   tgsi_scan_shader(state->tokens, &vs->base.info);
+   tgsi_scan_shader(vs->base.state.tokens, &vs->base.info);
 
    vs->base.state.stream_output = state->stream_output;
    vs->base.draw = draw;