diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-22 11:20:18 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-23 19:31:11 -0700 |
| commit | 246d59c29e3e5a57dcf2f60ad429eb1606193ef0 (patch) | |
| tree | 0b8aed47be86f6e68a37111257b094c900f39939 /src/mesa/drivers/dri/intel/intel_pixel_copy.c | |
| parent | 6a49473ab5797b1e6ce021e396902f9cb77674ef (diff) | |
intel: Fix some potential writes to zero-copy PBOs when used as regions.
I was in the midst of fixing some blitting-with-Y-tiled issues when I
noticed this. Hopefully PBO usage will be a little more robust, as a
result.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel_copy.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_copy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_copy.c b/src/mesa/drivers/dri/intel/intel_pixel_copy.c index d50dd68092..1a3e363846 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_copy.c @@ -362,11 +362,9 @@ do_blit_copypixels(GLcontext * ctx, &clip_x, &clip_y, &clip_w, &clip_h)) continue; - intelEmitCopyBlit(intel, dst->cpp, - src->pitch, src->buffer, 0, src->tiling, - dst->pitch, dst->buffer, 0, dst->tiling, - clip_x + delta_x, clip_y + delta_y, /* srcx, srcy */ - clip_x, clip_y, /* dstx, dsty */ + intel_region_copy(intel, + dst, 0, clip_x, clip_y, + src, 0, clip_x + delta_x, clip_y + delta_y, clip_w, clip_h, ctx->Color.ColorLogicOpEnabled ? ctx->Color.LogicOp : GL_COPY); |