KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "i965: Only emit 3DSTATE_DRAWING_RECTANGLE once on gen8+" 

This reverts commit a2c1e48f15.

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
This commit is contained in:
Mark Janes 2018-02-28 17:26:08 -08:00
parent 6c1b5a40fd
commit 0fc009b8c7
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/drivers/dri/i965/brw_misc_state.c
View File

@ -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();
}
}
/**

2
src/mesa/drivers/dri/i965/genX_blorp_exec.c
View File

@ -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);

4
src/mesa/drivers/dri/i965/genX_state_upload.c
View File

@ -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,