diff options
author | Brian Paul <brianp@vmware.com> | 2010-01-04 19:16:24 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-01-04 19:16:24 -0700 |
commit | 5ac16495a2772886100789f04e1a7d65068e9a40 (patch) | |
tree | 3a387294b977841ac4255ff8fbfedd1ce2dc8946 /src/mesa/drivers/dri/intel | |
parent | bfc34c880492f15dc47db30e88f888d1c48d5e70 (diff) | |
parent | 6d845808589b9df84f23551b122533a55dce6bd5 (diff) |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Diffstat (limited to 'src/mesa/drivers/dri/intel')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_copy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c index ee953cfbe7..ef5aed32f3 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_copy.c +++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c @@ -160,13 +160,14 @@ do_copy_texsubimage(struct intel_context *intel, intelImage->mt->cpp, src_pitch, src->buffer, - src->draw_offset, + 0, src->tiling, intelImage->mt->pitch, dst_bo, 0, intelImage->mt->region->tiling, - x, y, image_x + dstx, image_y + dsty, + src->draw_x + x, src->draw_y + y, + image_x + dstx, image_y + dsty, width, height, GL_COPY)) { UNLOCK_HARDWARE(intel); |