OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel_batchbuffer_flush: Don't assert cliprects when lock is not held.

Browse Source 
This is a legitimate situation when copying texture data between mipmap trees.
This commit is contained in:
Michel Dänzer
2006-12-14 10:49:26 +01:00
parent 4cb09df015
commit 5f8a3e586f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
View File

@@ -252,6 +252,7 @@ intel_batchbuffer_flush(struct intel_batchbuffer *batch)
{ {
struct intel_context *intel = batch->intel; struct intel_context *intel = batch->intel;
GLuint used = batch->ptr - batch->map; GLuint used = batch->ptr - batch->map;
GLboolean was_locked = intel->locked;
if (used == 0) if (used == 0)
return batch->last_fence; return batch->last_fence;
@@ -278,17 +279,14 @@ intel_batchbuffer_flush(struct intel_batchbuffer *batch)
/* TODO: Just pass the relocation list and dma buffer up to the /* TODO: Just pass the relocation list and dma buffer up to the
* kernel. * kernel.
*/ */
if (!intel->locked) { if (!was_locked)
assert(!(batch->flags & INTEL_BATCH_NO_CLIPRECTS));
LOCK_HARDWARE(intel); LOCK_HARDWARE(intel);
do_flush_locked(batch, used, GL_FALSE, GL_TRUE);
do_flush_locked(batch, used, !(batch->flags & INTEL_BATCH_CLIPRECTS),
GL_FALSE);
if (!was_locked)
UNLOCK_HARDWARE(intel); UNLOCK_HARDWARE(intel);
}
else {
GLboolean ignore_cliprects = !(batch->flags & INTEL_BATCH_CLIPRECTS);
do_flush_locked(batch, used, ignore_cliprects, GL_FALSE);
}
/* Reset the buffer: /* Reset the buffer:
*/ */