projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
intel_pixel_read.c
diff --git
a/src/mesa/drivers/dri/i915/intel_pixel_read.c
b/src/mesa/drivers/dri/i915/intel_pixel_read.c
index 2e31656e984080fe6a3a7c28caa0b9283ade9993..120c887abd63b447bf30b133434b81ec86ff30e0 100644
(file)
--- a/
src/mesa/drivers/dri/i915/intel_pixel_read.c
+++ b/
src/mesa/drivers/dri/i915/intel_pixel_read.c
@@
-35,7
+35,6
@@
#include "intel_screen.h"
#include "intel_context.h"
#include "intel_screen.h"
#include "intel_context.h"
-#include "intel_ioctl.h"
#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_buffers.h"
#include "intel_batchbuffer.h"
#include "intel_blit.h"
#include "intel_buffers.h"
@@
-173,7
+172,6
@@
do_blit_readpixels(GLcontext * ctx,
struct intel_buffer_object *dst = intel_buffer_object(pack->BufferObj);
GLuint dst_offset;
GLuint rowLength;
struct intel_buffer_object *dst = intel_buffer_object(pack->BufferObj);
GLuint dst_offset;
GLuint rowLength;
- dri_fence *fence = NULL;
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s\n", __FUNCTION__);
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s\n", __FUNCTION__);
@@
-264,7
+262,7
@@
do_blit_readpixels(GLcontext * ctx,
intelEmitCopyBlit(intel,
src->cpp,
intelEmitCopyBlit(intel,
src->cpp,
- src->pitch, src->buffer, 0, src->til
ed
,
+ src->pitch, src->buffer, 0, src->til
ing
,
rowLength, dst_buffer, dst_offset, GL_FALSE,
rect.x1,
rect.y1,
rowLength, dst_buffer, dst_offset, GL_FALSE,
rect.x1,
rect.y1,
@@
-273,19
+271,9
@@
do_blit_readpixels(GLcontext * ctx,
rect.x2 - rect.x1, rect.y2 - rect.y1,
GL_COPY);
}
rect.x2 - rect.x1, rect.y2 - rect.y1,
GL_COPY);
}
-
- intel_batchbuffer_flush(intel->batch);
- fence = intel->batch->last_fence;
- dri_fence_reference(fence);
-
}
UNLOCK_HARDWARE(intel);
}
UNLOCK_HARDWARE(intel);
- if (fence) {
- dri_fence_wait(fence);
- dri_fence_unreference(fence);
- }
-
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s - DONE\n", __FUNCTION__);
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s - DONE\n", __FUNCTION__);