On Mon, Nov 19, 2018 at 10:54:10AM +0200, Eleni Maria Stea wrote:
> Extended the intel_update_decompress_shadow to update all the mipmap
> tree levels so that we can display and run Get functions on mipmaps.
> ---
> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 48 +++
> 1 file changed, 29 insertions(+), 19 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index ef3e2c33d3..4886bb2b96 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -3962,15 +3962,16 @@ intel_update_decompressed_shadow(struct brw_context
> *brw,
> int img_h = smt->surf.logical_level0_px.height;
> int img_d = smt->surf.logical_level0_px.depth;
>
> - ptrdiff_t shadow_stride = _mesa_format_row_stride(smt->format, img_w);
> + int level_w = img_w;
> + int level_h = img_h;
>
> for (int level = smt->first_level; level <= smt->last_level; level++) {
> - struct compressed_pixelstore store;
> - _mesa_compute_compressed_pixelstore(mt->surf.dim,
> - mt->format,
> - img_w, img_h, img_d,
> - >ctx.Unpack,
> - );
> + ptrdiff_t shadow_stride = _mesa_format_row_stride(smt->format,
> +level_w);
> +
> + ptrdiff_t main_stride = _mesa_format_row_stride(mt->format,
> + level_w);
> +
>for (unsigned int slice = 0; slice < img_d; slice++) {
> GLbitfield mmode = GL_MAP_READ_BIT | BRW_MAP_DIRECT_BIT |
> BRW_MAP_ETC_BIT;
> @@ -3978,30 +3979,39 @@ intel_update_decompressed_shadow(struct brw_context
> *brw,
> GL_MAP_INVALIDATE_RANGE_BIT |
> BRW_MAP_DIRECT_BIT;
>
> - uint32_t img_x, img_y;
> - intel_miptree_get_image_offset(smt, level, slice, _x, _y);
> + uint32_t slevel_x, slevel_y;
> + intel_miptree_get_image_offset(smt, level, slice, _x,
> +_y);
> +
> + uint32_t mlevel_x, mlevel_y;
> + intel_miptree_get_image_offset(mt, level, slice, _x,
> +_y);
> +
> + void *mptr;
> + intel_miptree_map(brw, mt, level, slice, 0, 0,
> + level_w, level_h, mmode, , _stride);
>
> - void *mptr = intel_miptree_map_raw(brw, mt, mmode) + mt->offset
> -+ img_y * store.TotalBytesPerRow
> -+ img_x * store.TotalBytesPerRow / img_w;
>
> void *sptr;
> - intel_miptree_map(brw, smt, level, slice, img_x, img_y, img_w,
> img_h,
> - smode, , _stride);
> + intel_miptree_map(brw, smt, level, slice, 0, 0, level_w,
> + level_h, smode, , _stride);
>
> if (mt->format == MESA_FORMAT_ETC1_RGB8) {
> _mesa_etc1_unpack_rgba(sptr, shadow_stride,
> - mptr, store.TotalBytesPerRow,
> - img_w, img_h);
> + mptr, main_stride,
> + level_w, level_h);
> } else {
> _mesa_unpack_etc2_format(sptr, shadow_stride,
> - mptr, store.TotalBytesPerRow,
> - img_w, img_h, mt->format, true);
> + mptr, main_stride,
> + level_w, level_h, mt->format, true);
> }
>
> - intel_miptree_unmap_raw(mt);
> + intel_miptree_unmap(brw, mt, level, slice);
> intel_miptree_unmap(brw, smt, level, slice);
>}
> +
> + level_w /= 2;
> + level_h /= 2;
You want to use minify() to avoid level_w or level_h from becoming 0.
-Nanley
> }
>
> mt->shadow_needs_update = false;
> --
> 2.19.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
