projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch'
[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 0b95421a25fbe2695e34e884050615f04a517489..56087aacd4e9ede1c45938e52c61e8bb62442e9a 100644
(file)
--- a/
src/mesa/drivers/dri/i915/intel_pixel_read.c
+++ b/
src/mesa/drivers/dri/i915/intel_pixel_read.c
@@
-25,17
+25,16
@@
*
**************************************************************************/
*
**************************************************************************/
-#include "glheader.h"
-#include "enums.h"
-#include "mtypes.h"
-#include "macros.h"
-#include "image.h"
-#include "bufferobj.h"
+#include "
main/
glheader.h"
+#include "
main/
enums.h"
+#include "m
ain/m
types.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
image.h"
+#include "
main/
bufferobj.h"
#include "swrast/swrast.h"
#include "intel_screen.h"
#include "intel_context.h"
#include "swrast/swrast.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"
@@
-263,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,
@@
-272,8
+271,6
@@
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);
}
UNLOCK_HARDWARE(intel);
}
UNLOCK_HARDWARE(intel);