diff options
| author | Kenneth Graunke <[email protected]> | 2017-07-19 21:29:51 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-07-20 16:10:10 -0700 |
| commit | 8696c3e997d23f65ade53df8f7efcfb21a99fb3d (patch) | |
| tree | 3c19e981acd10d172739b04cfef5c18446cf111d /src/mesa/drivers | |
| parent | e87e4f239f77fe9eb75599db8175488d23606d48 (diff) | |
Revert "i965: Call intel_prepare_render() from intel_update_state()"
This reverts commit b7153c3e9f9d2d430b0338313587a00e531e4800.
The point of that commit was to ensure intel_prepare_render() occurred
before color resolves on the current framebuffer. In 0673bbfd9ba16be8
(i965: Move surface resolves back to draw/dispatch time), Jason moved
brw_predraw_resolve_framebuffer back to draw time, which is already
after a intel_prepare_render() call. So, this is no longer necessary.
Furthermore, it caused problems. "mpv" would only display a small
corner of movies, and Android started failing camera CTS tests.
This is because intel_prepare_render() ended up handling DRI2 events
which caused the drawable to be resized at an inopportune time, flagging
ctx->NewState |= _NEW_BUFFERS, but at a point where we've already copied
ctx->NewState, and failed to notice the newly set flag.
The lack of _NEW_BUFFERS caused us to skip 3DSTATE_DRAWING_RECTANGLE,
so the drawing ended up being clipped to an outdated framebuffer size.
Just drop the hack and go back to handling this at the proper time.
Thanks to Matti Hämäläinen (ccr), Tomasz Figa (tfiga), and Tapani Palli
for reporting these issues.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101558
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101704
Tested-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 0ef601d342e..b412ecff901 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -194,8 +194,6 @@ intel_update_state(struct gl_context * ctx) if (new_state & _NEW_POLYGON) brw->polygon_front_bit = _mesa_polygon_get_front_bit(ctx); - intel_prepare_render(brw); - if (new_state & _NEW_BUFFERS) { intel_update_framebuffer(ctx, ctx->DrawBuffer); if (ctx->DrawBuffer != ctx->ReadBuffer) |