[Mesa-dev] [PATCH 21/32] i965/miptree: Use ISL_AUX_STATE_PARTIAL_CLEAR for CCS_D

[Jason Ekstrand]

On Fri, Jul 21, 2017 at 1:13 PM, Pohjolainen, Topi <
topi.pohjolainen at gmail.com> wrote:

> On Wed, Jul 19, 2017 at 02:01:47PM -0700, Jason Ekstrand wrote:
> > ---
> >  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 11 ++++++-----
> >  1 file changed, 6 insertions(+), 5 deletions(-)
> >
> > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > index 91fcd0b..68e0246 100644
> > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> > @@ -2172,7 +2172,7 @@ get_ccs_d_resolve_op(enum isl_aux_state aux_state,
> >
> >     switch (aux_state) {
> >     case ISL_AUX_STATE_CLEAR:
> > -   case ISL_AUX_STATE_COMPRESSED_CLEAR:
> > +   case ISL_AUX_STATE_PARTIAL_CLEAR:
> >        if (!ccs_supported)
> >           return BLORP_FAST_CLEAR_OP_RESOLVE_FULL;
> >        else
> > @@ -2181,9 +2181,9 @@ get_ccs_d_resolve_op(enum isl_aux_state aux_state,
> >     case ISL_AUX_STATE_PASS_THROUGH:
> >        return BLORP_FAST_CLEAR_OP_NONE;
> >
> > -   case ISL_AUX_STATE_PARTIAL_CLEAR:
> >     case ISL_AUX_STATE_RESOLVED:
> >     case ISL_AUX_STATE_AUX_INVALID:
> > +   case ISL_AUX_STATE_COMPRESSED_CLEAR:
> >     case ISL_AUX_STATE_COMPRESSED_NO_CLEAR:
> >        break;
> >     }
> > @@ -2313,10 +2313,10 @@ intel_miptree_finish_ccs_write(struct
> brw_context *brw,
> >        case ISL_AUX_STATE_CLEAR:
> >           assert(written_with_ccs);
> >           intel_miptree_set_aux_state(brw, mt, level, layer, 1,
> > -                                     ISL_AUX_STATE_COMPRESSED_CLEAR);
> > +                                     ISL_AUX_STATE_PARTIAL_CLEAR);
> >           break;
> >
> > -      case ISL_AUX_STATE_COMPRESSED_CLEAR:
> > +      case ISL_AUX_STATE_PARTIAL_CLEAR:
> >           assert(written_with_ccs);
> >           break; /* Nothing to do */
> >
> > @@ -2324,7 +2324,7 @@ intel_miptree_finish_ccs_write(struct brw_context
> *brw,
> >           /* Nothing to do */
> >           break;
> >
> > -      case ISL_AUX_STATE_PARTIAL_CLEAR:
> > +      case ISL_AUX_STATE_COMPRESSED_CLEAR:
> >        case ISL_AUX_STATE_COMPRESSED_NO_CLEAR:
> >        case ISL_AUX_STATE_RESOLVED:
> >        case ISL_AUX_STATE_AUX_INVALID:
> > @@ -2384,6 +2384,7 @@ intel_miptree_finish_mcs_write(struct brw_context
> *brw,
> >     case ISL_AUX_STATE_RESOLVED:
> >     case ISL_AUX_STATE_PASS_THROUGH:
> >     case ISL_AUX_STATE_AUX_INVALID:
> > +   case ISL_AUX_STATE_PARTIAL_CLEAR:
>
> Doesn't this belong to the previous patch?
>

Sure.  I'll move it.


> >        unreachable("Invalid aux state for MCS");
> >     }
> >  }
> > --
> > 2.5.0.400.gff86faf
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170721/a739ba6b/attachment.html>