From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 24 Jan 2020 21:28:54 +0000 (-0500)
Subject: radeonsi: make screen available to shader part compilation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=688d2901b8466559fd4ed87a49fbc1cf8ed2ca1b;p=mesa.git

radeonsi: make screen available to shader part compilation

to fix a crash in is_multi_part_shader.

Fixes: 1a0890dcf30 - radeonsi: change prototypes of si_is_multi_part_shader & si_is_merged_shader
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3561>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 105e76260cd..fa35489ea50 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2090,7 +2090,11 @@ si_get_shader_part(struct si_screen *sscreen,
 	result = CALLOC_STRUCT(si_shader_part);
 	result->key = *key;
 
+	struct si_shader_selector sel = {};
+	sel.screen = sscreen;
+
 	struct si_shader shader = {};
+	shader.selector = &sel;
 
 	switch (type) {
 	case PIPE_SHADER_VERTEX: