diff options
| author | Mark Janes <[email protected]> | 2018-02-28 17:26:08 -0800 |
|---|---|---|
| committer | Mark Janes <[email protected]> | 2018-02-28 17:26:08 -0800 |
| commit | 0fc009b8c7bd6fb4a2cc77e9c4d0440acdc58ee1 (patch) | |
| tree | 01e5ec6b53ef357fae0ca87800997e941f4955ae /src/mesa/drivers | |
| parent | 6c1b5a40fde6f4ca77f8b866e99673b34df42116 (diff) | |
Revert "i965: Only emit 3DSTATE_DRAWING_RECTANGLE once on gen8+"
This reverts commit a2c1e48f15995a826dc759e064c2603882a37e0c.
On BDWGT3e and KBLGT3e systems, this commit regressed the following
tests:
piglit.spec.ext_framebuffer_multisample.accuracy 2 stencil_resolve small depthstencil
piglit.spec.ext_framebuffer_multisample.accuracy 4 stencil_resolve small depthstencil
piglit.spec.ext_framebuffer_multisample.accuracy 6 stencil_resolve small depthstencil
piglit.spec.ext_framebuffer_multisample.accuracy 8 stencil_resolve small depthstencil
piglit.spec.ext_framebuffer_multisample.accuracy all_samples stencil_resolve small depthstencil
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_misc_state.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_blorp_exec.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_state_upload.c | 4 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 2d2517d2bdf..c4ef6812bff 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -573,15 +573,6 @@ 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(); - } } /** diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index aa97981dd1f..062171af600 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -276,12 +276,10 @@ 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 eda812868bd..b38b61a874c 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -280,7 +280,6 @@ 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) @@ -304,7 +303,6 @@ 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, @@ -5658,6 +5656,8 @@ genX(init_atoms)(struct brw_context *brw) &genX(line_stipple), + &genX(drawing_rect), + &genX(vf_topology), &brw_indices, |