Mesa (staging/20.0): svga: Use pipe_shader_state_from_tgsi to set shader state

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: c4e1dd07eb5266e3da37dc35c701bea6b5d71c23
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4e1dd07eb5266e3da37dc35c701bea6b5d71c23

Author: Neha Bhende <bhenden at vmware.com>
Date:   Tue Dec 10 13:40:29 2019 +0530

svga: Use pipe_shader_state_from_tgsi to set shader state

Use pipe_shader_state_from_tgsi() to set shader state for transformed
shader so that we get all correct data for respective shader state.

This fixes several regressed glretrace, piglit crashes found during merging
upsteam mesa

Fixes: bf12bc2dd7a2 (draw: add nir info gathering and building support)

Reviewed-by: Charmaine Lee <charmainel at vmware.com>
(cherry picked from commit 144561dc5ec3dcbe63cb054f806247bc120b64e4)

---

 .pick_status.json                                    | 2 +-
 src/gallium/drivers/svga/svga_state_tgsi_transform.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 60affde7310..086d29af71e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -580,7 +580,7 @@
         "description": "svga: Use pipe_shader_state_from_tgsi to set shader state",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "bf12bc2dd7a28844103bb30a07be0440e60c5864"
     },
diff --git a/src/gallium/drivers/svga/svga_state_tgsi_transform.c b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
index b567aab6bc8..9d701b73772 100644
--- a/src/gallium/drivers/svga/svga_state_tgsi_transform.c
+++ b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
@@ -131,7 +131,7 @@ emulate_point_sprite(struct svga_context *svga,
          tgsi_dump(new_tokens, 0);
       }
 
-      templ.tokens = new_tokens;
+      pipe_shader_state_from_tgsi(&templ, new_tokens);
       templ.stream_output.num_outputs = 0;
 
       if (streamout) {