Module: Mesa Branch: master Commit: 688d2901b8466559fd4ed87a49fbc1cf8ed2ca1b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=688d2901b8466559fd4ed87a49fbc1cf8ed2ca1b
Author: Marek Olšák <[email protected]> Date: Fri Jan 24 16:28:54 2020 -0500 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> --- src/gallium/drivers/radeonsi/si_shader.c | 4 ++++ 1 file changed, 4 insertions(+) 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: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
