From: Topi Pohjolainen Date: Mon, 15 Feb 2016 08:58:41 +0000 (+0200) Subject: Revert "i965: Restore vbo after color resolve during brw_try_draw_prims()" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36b7c0dad90e5b24c33d9e3a803bc3a02f49d84b;p=mesa.git Revert "i965: Restore vbo after color resolve during brw_try_draw_prims()" This got pushed accidentally in the first place but wasn't reverted as it didn't regress piglit but instead fixed one newly introduced test exercising a corner in case in i965 driver. However, saving and restoring vertex buffer context is complicated and requires more thought. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94150 Signed-off-by: Topi Pohjolainen Reviewed-by: Tapani Palli --- diff --git a/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c b/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c index 93f1a8524ae..b2b07e7e58e 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c +++ b/src/mesa/drivers/dri/i965/brw_meta_fast_clear.c @@ -887,15 +887,6 @@ brw_meta_resolve_color(struct brw_context *brw, _mesa_meta_end(ctx); - /* Restore in case we were called in the middle of brw_try_draw_prims(). - * But only in case the just restored context really uses vertex buffer - * objects. - */ - if (ctx->API != API_OPENGLES) { - ctx->vbo_context->exec.array.recalculate_inputs = true; - vbo_bind_arrays(ctx); - } - /* We're typically called from intel_update_state() and we're supposed to * return with the state all updated to what it was before * brw_meta_resolve_color() was called. The meta rendering will have