From 85de50a077f01381c444f6c1048a4ea5e39621f8 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 26 May 2023 10:53:47 +0200 Subject: [PATCH] zink: do not lower line-smooth for non-lines We used to do this correctly, but it seems this accidentally got dropped. Fixes: d80a35a7f76 ("zink: unified `zink_set_primitive_emulation_keys` and `zink_create_primitive_emulation_gs`") Part-of: (cherry picked from commit b50c9ba692250bcbc2f373b4910345afe8a6515e) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_program.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cb7ec9a4dbb..bc289e5512e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -949,7 +949,7 @@ "description": "zink: do not lower line-smooth for non-lines", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d80a35a7f760f8ac9a10a1f715859f4db37f883e" }, diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 418b932c5fb..d9f88d6484d 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2283,9 +2283,10 @@ zink_set_primitive_emulation_keys(struct zink_context *ctx) zink_set_gs_key(ctx)->lower_line_stipple = lower_line_stipple; } - lower_line_smooth = screen->driver_workarounds.no_linesmooth && - ctx->rast_state->base.line_smooth && - !ctx->num_so_targets; + lower_line_smooth = ctx->gfx_pipeline_state.rast_prim == PIPE_PRIM_LINES && + screen->driver_workarounds.no_linesmooth && + ctx->rast_state->base.line_smooth && + !ctx->num_so_targets; if (zink_get_fs_key(ctx)->lower_line_smooth != lower_line_smooth) { assert(zink_get_gs_key(ctx)->lower_line_smooth ==