[Mesa-dev] [PATCH 2/2] i965: Only emit 3DSTATE_DRAWING_RECTANGLE once on gen9+

[Jason Ekstrand]

---
 src/mesa/drivers/dri/i965/brw_misc_state.c    | 9 +++++++++
 src/mesa/drivers/dri/i965/genX_blorp_exec.c   | 2 ++
 src/mesa/drivers/dri/i965/genX_state_upload.c | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index 53137cc..dce042e 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -558,6 +558,15 @@ brw_upload_invariant_state(struct brw_context *brw)
    BEGIN_BATCH(1);
    OUT_BATCH(_3DSTATE_VF_STATISTICS << 16 | 1);
    ADVANCE_BATCH();
+
+   if (devinfo->gen >= 8) {
+      BEGIN_BATCH(4);
+      OUT_BATCH(_3DSTATE_DRAWING_RECTANGLE << 16 | 1);
+      OUT_BATCH(0);
+      OUT_BATCH(~0);
+      OUT_BATCH(0);
+      ADVANCE_BATCH();
+   }
 }
 
 const struct brw_tracked_state brw_invariant_state = {
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index 3c7a7b4..0358341 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -245,10 +245,12 @@ retry:
    gen8_write_pma_stall_bits(brw, 0);
 #endif
 
+#if GEN_GEN < 8
    blorp_emit(batch, GENX(3DSTATE_DRAWING_RECTANGLE), rect) {
       rect.ClippedDrawingRectangleXMax = MAX2(params->x1, params->x0) - 1;
       rect.ClippedDrawingRectangleYMax = MAX2(params->y1, params->y0) - 1;
    }
+#endif
 
    blorp_exec(batch, params);
 
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index 9fe90a2..a926563 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -283,6 +283,7 @@ static const struct brw_tracked_state genX(line_stipple) = {
    .emit = genX(upload_line_stipple),
 };
 
+#if GEN_GEN < 8
 /* Constant single cliprect for framebuffer object or DRI2 drawing */
 static void
 genX(upload_drawing_rect)(struct brw_context *brw)
@@ -306,6 +307,7 @@ static const struct brw_tracked_state genX(drawing_rect) = {
    },
    .emit = genX(upload_drawing_rect),
 };
+#endif
 
 static uint32_t *
 genX(emit_vertex_buffer_state)(struct brw_context *brw,
@@ -5615,8 +5617,6 @@ genX(init_atoms)(struct brw_context *brw)
 
       &genX(line_stipple),
 
-      &genX(drawing_rect),
-
       &genX(vf_topology),
 
       &brw_indices,
-- 
2.5.0.400.gff86faf