We took it out with good reason... I'd rather we do something similar to what we did for render targets and just pass aux usage directly from brw_predraw_resolve_inputs to brw_wm_surface_state through the context.
On Tue, Feb 27, 2018 at 1:30 AM, <kevin.rogo...@intel.com> wrote: > From: Kevin Rogovin <kevin.rogo...@intel.com> > > Signed-off-by: Kevin Rogovin <kevin.rogo...@intel.com> > --- > src/mesa/drivers/dri/i965/brw_draw.c | 9 ++++++--- > src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 5 +++-- > src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 3 ++- > 3 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_draw.c > b/src/mesa/drivers/dri/i965/brw_draw.c > index 299e7f9..0241035 100644 > --- a/src/mesa/drivers/dri/i965/brw_draw.c > +++ b/src/mesa/drivers/dri/i965/brw_draw.c > @@ -447,7 +447,8 @@ brw_predraw_resolve_inputs(struct brw_context *brw, > bool rendering, > > intel_miptree_prepare_texture(brw, tex_obj->mt, view_format, > min_level, num_levels, > - min_layer, num_layers); > + min_layer, num_layers, > + false); > > /* If any programs are using it with texelFetch, we may need to > also do > * a prepare with an sRGB format to ensure texelFetch works > "properly". > @@ -458,7 +459,8 @@ brw_predraw_resolve_inputs(struct brw_context *brw, > bool rendering, > if (txf_format != view_format) { > intel_miptree_prepare_texture(brw, tex_obj->mt, txf_format, > min_level, num_levels, > - min_layer, num_layers); > + min_layer, num_layers, > + false); > } > } > > @@ -530,7 +532,8 @@ brw_predraw_resolve_framebuffer(struct brw_context > *brw, > if (irb) { > intel_miptree_prepare_texture(brw, irb->mt, > irb->mt->surf.format, > irb->mt_level, 1, > - irb->mt_layer, > irb->layer_count); > + irb->mt_layer, irb->layer_count, > + false); > } > } > } > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > index c6213b2..dbd9f7a 100644 > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c > @@ -2648,9 +2648,10 @@ intel_miptree_prepare_texture(struct brw_context > *brw, > struct intel_mipmap_tree *mt, > enum isl_format view_format, > uint32_t start_level, uint32_t num_levels, > - uint32_t start_layer, uint32_t num_layers) > + uint32_t start_layer, uint32_t num_layers, > + bool disable_aux) > { > - enum isl_aux_usage aux_usage = > + enum isl_aux_usage aux_usage = (disable_aux) ? ISL_AUX_USAGE_NONE : > intel_miptree_texture_aux_usage(brw, mt, view_format); > bool clear_supported = aux_usage != ISL_AUX_USAGE_NONE; > > diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h > b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h > index 07c8580..ee72309 100644 > --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h > +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h > @@ -642,7 +642,8 @@ intel_miptree_prepare_texture(struct brw_context *brw, > struct intel_mipmap_tree *mt, > enum isl_format view_format, > uint32_t start_level, uint32_t num_levels, > - uint32_t start_layer, uint32_t num_layers); > + uint32_t start_layer, uint32_t num_layers, > + bool disable_aux); > void > intel_miptree_prepare_image(struct brw_context *brw, > struct intel_mipmap_tree *mt); > -- > 2.7.4 > > _______________________________________________ > 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