fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 20:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel: Use a handy helper in glReadPixels source clipping.

Browse source
This commit is contained in:
Eric Anholt 2010-01-26 18:01:37 -08:00
parent 41f4d82ba8
commit c8e6a0f2f8
4 changed files with 19 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/intel/intel_blit.c
View file

@ -102,7 +102,7 @@ intelEmitCopyBlit(struct intel_context *intel,
return GL_FALSE;
}
/* do space/cliprects check before going any further */
/* do space check before going any further */
do {
aper_array[0] = intel->batch->buf;
aper_array[1] = dst_buffer;

35
src/mesa/drivers/dri/intel/intel_buffers.c
View file

@ -31,41 +31,6 @@
#include "intel_batchbuffer.h"
#include "main/framebuffer.h"
/**
* XXX move this into a new dri/common/cliprects.c file.
*/
GLboolean
intel_intersect_cliprects(drm_clip_rect_t * dst,
const drm_clip_rect_t * a,
const drm_clip_rect_t * b)
{
GLint bx = b->x1;
GLint by = b->y1;
GLint bw = b->x2 - bx;
GLint bh = b->y2 - by;
if (bx < a->x1)
bw -= a->x1 - bx, bx = a->x1;
if (by < a->y1)
bh -= a->y1 - by, by = a->y1;
if (bx + bw > a->x2)
bw = a->x2 - bx;
if (by + bh > a->y2)
bh = a->y2 - by;
if (bw <= 0)
return GL_FALSE;
if (bh <= 0)
return GL_FALSE;
dst->x1 = bx;
dst->y1 = by;
dst->x2 = bx + bw;
dst->y2 = by + bh;
return GL_TRUE;
}
/**
* Return pointer to current color drawing region, or NULL.
*/

6
src/mesa/drivers/dri/intel/intel_buffers.h
View file

@ -35,12 +35,6 @@
struct intel_context;
struct intel_framebuffer;
extern GLboolean
intel_intersect_cliprects(drm_clip_rect_t * dest,
const drm_clip_rect_t * a,
const drm_clip_rect_t * b);
extern struct intel_region *intel_readbuf_region(struct intel_context *intel);
extern struct intel_region *intel_drawbuf_region(struct intel_context *intel);

40
src/mesa/drivers/dri/intel/intel_pixel_read.c
View file

@ -169,7 +169,8 @@ do_blit_readpixels(GLcontext * ctx,
GLuint dst_offset;
GLuint rowLength;
drm_intel_bo *dst_buffer;
drm_clip_rect_t read_bounds, rect, src_rect;
GLboolean all;
GLint dst_x, dst_y;
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s\n", __FUNCTION__);
@ -217,38 +218,33 @@ do_blit_readpixels(GLcontext * ctx,
dst_offset = (GLintptr) _mesa_image_address(2, pack, pixels, width, height,
format, type, 0, 0, 0);
GLboolean all = (width * height * src->cpp == dst->Base.Size &&
x == 0 && dst_offset == 0);
if (!_mesa_clip_copytexsubimage(ctx,
&dst_x, &dst_y,
&x, &y,
&width, &height)) {
return GL_TRUE;
}
all = (width * height * src->cpp == dst->Base.Size &&
x == 0 && dst_offset == 0);
dst_x = 0;
dst_y = 0;
dst_buffer = intel_bufferobj_buffer(intel, dst,
all ? INTEL_WRITE_FULL :
INTEL_WRITE_PART);
src_rect.x1 = x;
if (ctx->ReadBuffer->Name == 0)
src_rect.y1 = ctx->ReadBuffer->Height - (y + height);
else
src_rect.y1 = y;
src_rect.x2 = src_rect.x1 + width;
src_rect.y2 = src_rect.y1 + height;
read_bounds.x1 = 0;
read_bounds.y1 = 0;
read_bounds.x2 = ctx->ReadBuffer->Width;
read_bounds.y2 = ctx->ReadBuffer->Height;
if (!intel_intersect_cliprects(&rect, &src_rect, &read_bounds))
return GL_TRUE;
y = ctx->ReadBuffer->Height - (y + height);
if (!intelEmitCopyBlit(intel,
src->cpp,
src->pitch, src->buffer, 0, src->tiling,
rowLength, dst_buffer, dst_offset, GL_FALSE,
rect.x1,
rect.y1,
rect.x1 - src_rect.x1,
rect.y2 - src_rect.y2,
rect.x2 - rect.x1, rect.y2 - rect.y1,
x, y,
dst_x, dst_y,
width, height,
GL_COPY)) {
return GL_FALSE;
}