From f97fa6f5f573ddcacf5a69d5ee3603b869c7cc2d Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 11 May 2021 12:38:57 -0400
Subject: [PATCH] zink: move line width and depth bias updating into
 conditional during draw

only do calculations when needed

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11667>
---
 src/gallium/drivers/zink/zink_draw.c | 62 +++++++++++++++-------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 4cd9502f8a5..1b84bb52900 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -411,6 +411,7 @@ zink_draw_vbo(struct pipe_context *pctx,
    VkBuffer counter_buffers[PIPE_MAX_SO_OUTPUTS];
    VkDeviceSize counter_buffer_offsets[PIPE_MAX_SO_OUTPUTS];
    bool need_index_buffer_unref = false;
+   bool mode_changed = ctx->gfx_pipeline_state.mode != dinfo->mode;
 
    update_barriers(ctx, false);
 
@@ -437,26 +438,6 @@ zink_draw_vbo(struct pipe_context *pctx,
       ctx->gfx_pipeline_state.dirty = true;
    ctx->gfx_pipeline_state.primitive_restart = dinfo->primitive_restart;
 
-   enum pipe_prim_type reduced_prim = u_reduced_prim(dinfo->mode);
-
-   bool depth_bias = false;
-   switch (reduced_prim) {
-   case PIPE_PRIM_POINTS:
-      depth_bias = rast_state->offset_point;
-      break;
-
-   case PIPE_PRIM_LINES:
-      depth_bias = rast_state->offset_line;
-      break;
-
-   case PIPE_PRIM_TRIANGLES:
-      depth_bias = rast_state->offset_tri;
-      break;
-
-   default:
-      unreachable("unexpected reduced prim");
-   }
-
    unsigned index_offset = 0;
    struct pipe_resource *index_buffer = NULL;
    if (dinfo->index_size > 0) {
@@ -557,13 +538,6 @@ zink_draw_vbo(struct pipe_context *pctx,
    ctx->vp_state_changed = false;
    ctx->scissor_changed = false;
 
-   if (line_width_needed(reduced_prim, rast_state->hw_state.polygon_mode)) {
-      if (screen->info.feats.features.wideLines || ctx->line_width == 1.0f)
-         vkCmdSetLineWidth(batch->state->cmdbuf, ctx->line_width);
-      else
-         debug_printf("BUG: wide lines not supported, needs fallback!");
-   }
-
    if (ctx->stencil_ref_changed) {
       vkCmdSetStencilReference(batch->state->cmdbuf, VK_STENCIL_FACE_FRONT_BIT,
                                ctx->stencil_ref.ref_value[0]);
@@ -611,15 +585,45 @@ zink_draw_vbo(struct pipe_context *pctx,
       ctx->dsa_state_changed = false;
    }
 
-   if (pipeline_changed || ctx->rast_state_changed) {
+   bool rast_state_changed = ctx->rast_state_changed;
+   if (pipeline_changed || rast_state_changed) {
       if (screen->info.have_EXT_extended_dynamic_state)
          screen->vk.CmdSetFrontFaceEXT(batch->state->cmdbuf, ctx->gfx_pipeline_state.front_face);
+   }
+
+   if (pipeline_changed || rast_state_changed || mode_changed) {
+      enum pipe_prim_type reduced_prim = u_reduced_prim(dinfo->mode);
+
+      bool depth_bias = false;
+      switch (reduced_prim) {
+      case PIPE_PRIM_POINTS:
+         depth_bias = rast_state->offset_point;
+         break;
+
+      case PIPE_PRIM_LINES:
+         depth_bias = rast_state->offset_line;
+         break;
+
+      case PIPE_PRIM_TRIANGLES:
+         depth_bias = rast_state->offset_tri;
+         break;
+
+      default:
+         unreachable("unexpected reduced prim");
+      }
+
+      if (line_width_needed(reduced_prim, rast_state->hw_state.polygon_mode)) {
+         if (screen->info.feats.features.wideLines || ctx->line_width == 1.0f)
+            vkCmdSetLineWidth(batch->state->cmdbuf, ctx->line_width);
+         else
+            debug_printf("BUG: wide lines not supported, needs fallback!");
+      }
       if (depth_bias)
          vkCmdSetDepthBias(batch->state->cmdbuf, rast_state->offset_units, rast_state->offset_clamp, rast_state->offset_scale);
       else
          vkCmdSetDepthBias(batch->state->cmdbuf, 0.0f, 0.0f, 0.0f);
-      ctx->rast_state_changed = false;
    }
+   ctx->rast_state_changed = false;
 
    if (ctx->sample_locations_changed) {
       VkSampleLocationsInfoEXT loc;