zink: don't access non_fs part of zink_shader from fs
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Thu, 6 Apr 2023 18:49:31 +0000 (14:49 -0400)
committerMarge Bot <emma+marge@anholt.net>
Fri, 7 Apr 2023 13:10:03 +0000 (13:10 +0000)
Fixes: a6de15eff56 ("zink: add flags to `zink_gfx_program` and `zink_context`")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22347>

src/gallium/drivers/zink/zink_program.c

index 19e42c1..e6a95c0 100644 (file)
@@ -1039,7 +1039,8 @@ zink_create_gfx_program(struct zink_context *ctx,
       if (stages[i]) {
          prog->shaders[i] = stages[i];
          prog->stages_present |= BITFIELD_BIT(i);
-         prog->optimal_keys &= !prog->shaders[i]->non_fs.is_generated;
+         if (i != MESA_SHADER_FRAGMENT)
+            prog->optimal_keys &= !prog->shaders[i]->non_fs.is_generated;
          prog->needs_inlining |= prog->shaders[i]->needs_inlining;
          nir[i] = zink_shader_deserialize(screen, stages[i]);
       } else {