<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Wed, Jun 29, 2016 at 3:12 PM, Chad Versace <<a href="mailto:chad.versace@intel.com" target="_blank">chad.versace@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu 23 Jun 2016, Jason Ekstrand wrote: > --- > src/intel/isl/isl.h | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h > index 4aedb11..5011d15 100644 > --- a/src/intel/isl/isl.h > +++ b/src/intel/isl/isl.h > @@ -506,6 +506,32 @@ enum isl_dim_layout { > ISL_DIM_LAYOUT_GEN9_1D, > }; > > +enum isl_aux_layout { > + /** No Auxiliary surface is used */ ^^^ lowercase 'a' > + ISL_AUX_LAYOUT_NONE, > + > + /** The primary surface is a depth surface and the auxiliary surface is HiZ */ > + ISL_AUX_LAYOUT_HIZ, > + > + /** The auxiliary surface is an MCS > + * > + * @invariant isl_surf::samples > 1 > + */ > + ISL_AUX_LAYOUT_MCS, > + > + /** The auxiliary surface is a fast-clear-only compression surface > + * > + * @invariant isl_surf::samples == 1 > + */ > + ISL_AUX_LAYOUT_CCS_D, > + > + /** The auxiliary surface provides full lossless color compression > + * > + * @invariant isl_surf::samples == 1 > + */ > + ISL_AUX_LAYOUT_CCS_E, > +}; On Monday, we discussed changing this to enum isl_aux_usage { ISL_AUX_USAGE_NONE, ISL_AUX_USAGE_HIZ, ISL_AUX_USAGE_MCS, ISL_AUX_USAGE_CCS_D, ISL_AUX_USAGE_CCS_E, }; because the enum doesn't really specify "layout"; it specifies "usage". For example, on any given gen, the layout of ccs_d and ccs_e is identical. </blockquote></div> </div><div class="gmail_extra">Already changed locally </div></div>