diff options
| author | Keith Whitwell <[email protected]> | 2006-11-21 14:43:30 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2006-11-21 14:43:30 +0000 |
| commit | f332da515cdb8cacc3fdba8a74267d015b7c08be (patch) | |
| tree | 1c453c2d58ee71b87785109f91ed59c2e6de321d /src/mesa/drivers/dri/i915tex/intel_pixel_read.c | |
| parent | b1c102d37bb3c273a2623358cb8ebff00bdfb65e (diff) | |
blend, logicop changes for intelEmitCopyBlit backported to i915
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_pixel_read.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_pixel_read.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel_read.c b/src/mesa/drivers/dri/i915tex/intel_pixel_read.c index c1cc65674d1..24e49ae0663 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel_read.c +++ b/src/mesa/drivers/dri/i915tex/intel_pixel_read.c @@ -271,7 +271,8 @@ do_blit_readpixels(GLcontext * ctx, rect.y1, rect.x1 - src_rect.x1, rect.y2 - src_rect.y2, - rect.x2 - rect.x1, rect.y2 - rect.y1); + rect.x2 - rect.x1, rect.y2 - rect.y1, + GL_COPY); } fence = intel_batchbuffer_flush(intel->batch); @@ -280,11 +281,12 @@ do_blit_readpixels(GLcontext * ctx, } UNLOCK_HARDWARE(intel); - if (intel->driDrawable->numClipRects) + if (fence) { driFenceFinish(fence, DRM_FENCE_TYPE_EXE | DRM_I915_FENCE_TYPE_RW, GL_FALSE); + driFenceUnReference(fence); + } - driFenceUnReference(fence); if (INTEL_DEBUG & DEBUG_PIXEL) _mesa_printf("%s - DONE\n", __FUNCTION__); |