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 <topi.pohjolainen@intel.com>
Reviewed-by: Tapani Palli <tapani.palli@intel.com>

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 93f1a8524aeba4c384ec45b029b2b41643ee9e34..b2b07e7e58e800f7b84b6f62091f9bcb84a73847 100644 (file)
--- 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