[Mesa-dev] [PATCH 08/26] i965: Provide slice details to color resolver

[Pohjolainen, Topi]

On Sat, Oct 29, 2016 at 12:34:18AM -0700, Jason Ekstrand wrote:
>    On Tue, Oct 11, 2016 at 12:26 PM, Topi Pohjolainen
>    <[1]topi.pohjolainen at gmail.com> wrote:
> 
>      Signed-off-by: Topi Pohjolainen <[2]topi.pohjolainen at intel.com>
>      ---
>       src/mesa/drivers/dri/i965/brw_blorp.c         | 14 ++++++++------
>       src/mesa/drivers/dri/i965/brw_blorp.h         |  3 ++-
>       src/mesa/drivers/dri/i965/brw_context.c       | 16 +++++++++++-----
>       src/mesa/drivers/dri/i965/intel_blit.c        |  8 ++++++--
>       src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 27
>      +++++++++++++++++++++++++--
>       src/mesa/drivers/dri/i965/intel_mipmap_tree.h |  1 +
>       6 files changed, 53 insertions(+), 16 deletions(-)
>      diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c
>      b/src/mesa/drivers/dri/i965/brw_blorp.c
>      index 4030038..c55bbc8 100644
>      --- a/src/mesa/drivers/dri/i965/brw_blorp.c
>      +++ b/src/mesa/drivers/dri/i965/brw_blorp.c
>      @@ -324,7 +324,8 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
>           * to destination color buffers, and the standard render path is
>           * fast-color-aware.
>           */
>      -   intel_miptree_resolve_color(brw, src_mt,
>      INTEL_MIPTREE_IGNORE_CCS_E);
>      +   intel_miptree_resolve_color(brw, src_mt, src_level,
>      src_logical_layer,
>      +                               INTEL_MIPTREE_IGNORE_CCS_E);
>          intel_miptree_slice_resolve_depth(brw, src_mt, src_level,
>      src_layer);
>          intel_miptree_slice_resolve_depth(brw, dst_mt, dst_level,
>      dst_layer);
>      @@ -409,7 +410,8 @@ brw_blorp_copy_miptrees(struct brw_context *brw,
>           * to destination color buffers, and the standard render path is
>           * fast-color-aware.
>           */
>      -   intel_miptree_resolve_color(brw, src_mt,
>      INTEL_MIPTREE_IGNORE_CCS_E);
>      +   intel_miptree_resolve_color(brw, src_mt, src_level, src_layer,
>      +                               INTEL_MIPTREE_IGNORE_CCS_E);
>          intel_miptree_slice_resolve_depth(brw, src_mt, src_level,
>      src_layer);
>          intel_miptree_slice_resolve_depth(brw, dst_mt, dst_level,
>      dst_layer);
>      @@ -918,22 +920,22 @@ brw_blorp_clear_color(struct brw_context *brw,
>      struct gl_framebuffer *fb,
>       }
>       void
>      -brw_blorp_resolve_color(struct brw_context *brw, struct
>      intel_mipmap_tree *mt)
>      +brw_blorp_resolve_color(struct brw_context *brw, struct
>      intel_mipmap_tree *mt,
>      +                        unsigned level, unsigned layer)
>       {
>          DBG("%s to mt %p\n", __FUNCTION__, mt);
>          const mesa_format format = _mesa_get_srgb_format_linear(
>      mt->format);
>      -   intel_miptree_check_level_layer(mt, 0 /* level */, 0 /* layer
>      */);
>      +   intel_miptree_check_level_layer(mt, level, layer);
>          struct isl_surf isl_tmp[2];
>          struct blorp_surf surf;
>      -   unsigned level = 0;
>          blorp_surf_for_miptree(brw, &surf, mt, true, &level, isl_tmp);
>          struct blorp_batch batch;
>          blorp_batch_init(&brw->blorp, &batch, brw);
>      -   blorp_ccs_resolve(&batch, &surf, 0 /* level */, 0 /* layer */,
>      +   blorp_ccs_resolve(&batch, &surf, level, layer,
>                            brw_blorp_to_isl_format(brw, format, true));
>          blorp_batch_finish(&batch);
>      diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h
>      b/src/mesa/drivers/dri/i965/brw_blorp.h
>      index abf3956..ca0a5dd 100644
>      --- a/src/mesa/drivers/dri/i965/brw_blorp.h
>      +++ b/src/mesa/drivers/dri/i965/brw_blorp.h
>      @@ -64,7 +64,8 @@ brw_blorp_clear_color(struct brw_context *brw,
>      struct gl_framebuffer *fb,
>       void
>       brw_blorp_resolve_color(struct brw_context *brw,
>      -                        struct intel_mipmap_tree *mt);
>      +                        struct intel_mipmap_tree *mt,
>      +                       unsigned level, unsigned layer);
> 
>    There's a tab hiding out in here.

Thanks, fixed locally.