panfrost: Fix crash with GALLIUM_HUD
authorAlyssa Rosenzweig <alyssa@collabora.com>
Fri, 20 May 2022 20:30:46 +0000 (16:30 -0400)
committerMarge Bot <emma+marge@anholt.net>
Thu, 26 May 2022 14:01:42 +0000 (14:01 +0000)
Due to the order of binding shaders, GALLIUM_HUD triggered a NULL pointer
dereference in the new shader variants code.

Fixes: 0fcddd4d2c4 ("pan/bi: Rework varying linking on Valhall")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16707>

src/gallium/drivers/panfrost/pan_context.c

index e9567d9..4be9a2d 100644 (file)
@@ -526,6 +526,10 @@ panfrost_update_shader_variant(struct panfrost_context *ctx,
         if (type == PIPE_SHADER_FRAGMENT && !ctx->shader[PIPE_SHADER_VERTEX])
                 return;
 
+        /* Also defer, happens with GALLIUM_HUD */
+        if (!ctx->shader[type])
+                return;
+
         /* Match the appropriate variant */
         signed variant = -1;
         struct panfrost_shader_variants *variants = ctx->shader[type];