[Mesa-dev] [PATCH] Revert "i965: Restore vbo after color resolve during brw_try_draw_prims()"

[Mark Janes]

Ben Widawsky <benjamin.widawsky at intel.com> writes:

> On Mon, Feb 15, 2016 at 11:34:03AM +0200, Topi Pohjolainen wrote:
>> 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.
>
> So now a revert is going to cause a piglit regression? What a weird world we
> live in. Mark, can you make sure the test mentioned in the bug
> (getteximage-formats init-by-clear-and-render) gets skipped after the revert
> lands?

The revert landed, however the test is not skipped.  It fails.

I wrote up bug 94181 to track that regression before I associated it
with this thread.

>
> Reviewed-by: Ben Widawsky <benjamin.widawsky at intel.com>
>
>> 
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94150
>> 
>> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
>> CC: Ben Widawsky <benjamin.widawsky at intel.com>
>> CC: Ian Romanick <idr at freedesktop.org>
>> Reviewed-by: Tapani Palli <tapani.palli at intel.com>
>> ---
>>  src/mesa/drivers/dri/i965/brw_meta_fast_clear.c | 9 ---------
>>  1 file changed, 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 93f1a85..b2b07e7 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
>> -- 
>> 2.5.0
>> 
>
> -- 
> Ben Widawsky, Intel Open Source Technology Center