diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-05-05 11:20:05 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-06-06 11:47:46 -0700 |
| commit | 5dc35e1664f7858679424f2c8ab606e6c0d8b768 (patch) | |
| tree | 605ea19e0df294ca0471e6105ef12c58b8292eff /src/mesa/drivers/dri/i965/intel_pixel_read.c | |
| parent | d7024a6b3cd16836597902593e25cb43989c0130 (diff) | |
i965: Remove brw_bo's virtual member
Just return the map from brw_map_bo_*
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_pixel_read.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_pixel_read.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/intel_pixel_read.c index 8793c3e4c0f..3eca28a4b18 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_read.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_read.c @@ -84,8 +84,6 @@ intel_readpixels_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; @@ -147,8 +145,8 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx, intel_batchbuffer_flush(brw); } - error = brw_bo_map(brw, bo, false /* write enable */); - if (error) { + void *map = brw_bo_map(brw, bo, false /* write enable */); + if (map == NULL) { DBG("%s: failed to map bo\n", __func__); return false; } @@ -188,7 +186,7 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx, xoffset * cpp, (xoffset + width) * cpp, yoffset, yoffset + height, pixels - (ptrdiff_t) yoffset * dst_pitch - (ptrdiff_t) xoffset * cpp, - bo->virtual + irb->mt->offset, + map + irb->mt->offset, dst_pitch, irb->mt->pitch, brw->has_swizzling, irb->mt->tiling, |