[Mesa-dev] [PATCH] intel: Don't try intel_miptree_map_blit if a region is already mapped

[Chad Versace]

On 01/27/2012 12:07 AM, Eric Anholt wrote:
> On Thu, 26 Jan 2012 18:29:30 -0800, "Ian Romanick" <idr at freedesktop.org> wrote:
>> From: Ian Romanick <ian.d.romanick at intel.com>
>>
>> Eventually this path leads to _intel_batchbuffer_flush.  The first
>> thing there is an assertion that nothing is mapped.
>>
>> Fixes the afore mentioned assertion failure in piglit's
>> fbo-mipmap-copypix, and is related to bug #43328.
>>
>> NOTE: This is a candidate for the 8.0 branch.
>>
>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
> 
> I think the assert is invalid and should be dropped instead.
> 
> (basically: the assert is assuming that if *anything* is mapped, the
> batch has been flushed, while the reasonable and more common thing to
> do, is to flush if your particular buffer was already in use).

I'm ok with removing the assertion as long its intent is satisfied:
    /* No batch should be emitted that uses a mapped region, because that would
     * cause the map to be incoherent with GPU rendering done by the
     * batchbuffer.
Since intel_miptree_{map,unmap}_* are flushing at the right time to avoid that,
I think we are satisfying that condition, and it's safe to remove the assertion.

----
Chad Versace
chad.versace at linux.intel.com