Series is
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
The hack you remove in patch 4 always bothered me. Good riddance!
On 04/26/2016 12:25 PM, Kenneth Graunke wrote:
> We called intel_miptree_get_image_offset() to get the image offsets
> for the current level/slice, but then proceeded to ignore the results
> and clobber level/slice 0 every time.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94713
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 4072bdf..3d8f48e 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -2498,8 +2498,8 @@ intel_miptree_unmap_s8(struct brw_context *brw,
> for (uint32_t y = 0; y < map->h; y++) {
> for (uint32_t x = 0; x < map->w; x++) {
> ptrdiff_t offset = intel_offset_S8(mt->pitch,
> - x + map->x,
> - y + map->y,
> + image_x + x + map->x,
> + image_y + y + map->y,
> brw->has_swizzling);
> tiled_s8_map[offset] = untiled_s8_map[y * map->w + x];
> }
>