fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 13:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

i915g: Don't avoid flushing when we have a pending fence.

Browse source 
Otherwise the fence will never arrive.
Also check for a NULL i915->batch.

NOTE: This is a candidate for the 8.0 branch.
This commit is contained in:
Stéphane Marchesin 2012-01-18 19:24:18 -08:00
parent 2b4afdba05
commit 32b07bb149
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/i915/i915_flush.c
View file

@ -45,7 +45,10 @@ static void i915_flush_pipe( struct pipe_context *pipe,
draw_flush(i915->draw);
if (i915->batch->map == i915->batch->ptr) {
/* Only shortcut this if we have no fence, otherwise we must flush the
* empty batchbuffer to get our fence back.
*/
if (!fence && i915->batch && (i915->batch->map == i915->batch->ptr)) {
return;
}