summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Pohjolainen <[email protected]>2016-02-15 10:58:41 +0200
committerTopi Pohjolainen <[email protected]>2016-02-16 08:52:14 +0200
commit36b7c0dad90e5b24c33d9e3a803bc3a02f49d84b (patch)
tree7235511a742f923a31f4003712309c6b0a626d4f /src
parent33ace5544e755b74ac7c02a7d590f3c64139cc3a (diff)
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 <[email protected]> Reviewed-by: Tapani Palli <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_meta_fast_clear.c9
1 files changed, 0 insertions, 9 deletions
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