diff --git a/.pick_status.json b/.pick_status.json index 4e5108c9589..9083c5150ee 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1834,7 +1834,7 @@ "description": "zink: Only call reapply_color_write if EXT_color_write_enable is available", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 42ff1bf8b0c..5916839c37b 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -5506,7 +5506,8 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) if (!is_copy_only && !is_compute_only) { pipe_buffer_write_nooverlap(&ctx->base, ctx->dummy_vertex_buffer, 0, sizeof(data), data); pipe_buffer_write_nooverlap(&ctx->base, ctx->dummy_xfb_buffer, 0, sizeof(data), data); - reapply_color_write(ctx); + if (screen->info.have_EXT_color_write_enable) + reapply_color_write(ctx); /* set on startup just to avoid validation errors if a draw comes through without * a tess shader later