diff options
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_tex_subimage.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_subimage.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c index 912622253a4..54c0bfe705d 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c @@ -86,8 +86,6 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, /* The miptree's buffer. */ struct brw_bo *bo; - int error = 0; - uint32_t cpp; mem_copy_fn mem_copy = NULL; @@ -148,8 +146,8 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, intel_batchbuffer_flush(brw); } - error = brw_bo_map(brw, bo, true /* write enable */); - if (error || bo->virtual == NULL) { + void *map = brw_bo_map(brw, bo, true /* write enable */); + if (map == NULL) { DBG("%s: failed to map bo\n", __func__); return false; } @@ -177,7 +175,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, linear_to_tiled( xoffset * cpp, (xoffset + width) * cpp, yoffset, yoffset + height, - bo->virtual, + map, pixels - (ptrdiff_t) yoffset * src_pitch - (ptrdiff_t) xoffset * cpp, image->mt->pitch, src_pitch, brw->has_swizzling, |