summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-07-28 11:09:19 -0400
committerDylan Baker <dylan.c.baker@intel.com>2022-08-11 10:30:37 -0700
commit65c10ac61dd6e93b20a16ba34c79087f08cf54e1 (patch)
tree962fa842d5ddf084f5186cc0cc26a38bba2f4467
parent03ea182f4fd5d9a5c69ea722eb37dfa8d8224747 (diff)
downloadmesa-65c10ac61dd6e93b20a16ba34c79087f08cf54e1.tar.gz
zink: drop mode_changed check from linewidth/depthbias draw updates
this doesn't need to be updated on primtype change since it's always set cc: mesa-stable Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17775> (cherry picked from commit a912952c3ea8f4191abc83e3638c6f09341ef15b)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/zink/zink_draw.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 1c13c90cb80..cb7a05960e7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2200,7 +2200,7 @@
"description": "zink: drop mode_changed check from linewidth/depthbias draw updates",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp
index e7f97ec6b86..6782839cc1b 100644
--- a/src/gallium/drivers/zink/zink_draw.cpp
+++ b/src/gallium/drivers/zink/zink_draw.cpp
@@ -719,7 +719,7 @@ zink_draw(struct pipe_context *pctx,
screen->info.have_EXT_line_rasterization && rast_state->base.line_stipple_enable)
VKCTX(CmdSetLineStippleEXT)(batch->state->cmdbuf, rast_state->base.line_stipple_factor, rast_state->base.line_stipple_pattern);
- if (BATCH_CHANGED || ctx->rast_state_changed || mode_changed) {
+ if (BATCH_CHANGED || ctx->rast_state_changed) {
enum pipe_prim_type reduced_prim = ctx->last_vertex_stage->reduced_prim;
if (reduced_prim == PIPE_PRIM_MAX)
reduced_prim = u_reduced_prim(mode);