<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Jun 19, 2017 at 4:46 PM, Nanley Chery <<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Mon, Jun 19, 2017 at 04:16:32PM -0700, Jason Ekstrand wrote: > On Tue, Jun 13, 2017 at 11:41 AM, Nanley Chery <<a href="mailto:nanleychery@gmail.com">nanleychery@gmail.com</a>> > wrote: > > > v2: > > - Check for aux levels in layer helper (Jason Ekstrand) > > - Don't assert aux is present, return 0 if it isn't. > > - Use the helpers. > > > > Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>> > > --- > > src/intel/vulkan/anv_blorp.c | 4 ++++ > > src/intel/vulkan/anv_private.h | 39 ++++++++++++++++++++++++++++++ > > +++++++++ > > 2 files changed, 43 insertions(+) > > > > diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c > > index a869eebc24..421f860428 100644 > > --- a/src/intel/vulkan/anv_blorp.c > > +++ b/src/intel/vulkan/anv_blorp.c > > @@ -1436,6 +1436,7 @@ anv_image_ccs_clear(struct anv_cmd_buffer > > *cmd_buffer, > > const struct isl_view *view, > > const VkImageSubresourceRange *subresourceRange) > > { > > + assert(anv_image_has_color_aux(image) && image->samples == 1); > > assert(image->type == VK_IMAGE_TYPE_3D || image->extent.depth == 1); > > > > struct blorp_batch batch; > > @@ -1488,6 +1489,9 @@ anv_image_ccs_clear(struct anv_cmd_buffer > > *cmd_buffer, > > blorp_layer_count = anv_get_layerCount(image, subresourceRange); > > } > > > > + assert(level < anv_color_aux_levels(image)); > > + assert(blorp_base_layer + blorp_layer_count <= > > + anv_color_aux_layers(image, level)); > > blorp_fast_clear(&batch, &surf, surf.surf->format, > > level, blorp_base_layer, blorp_layer_count, > > 0, 0, extent.width, extent.height); > > diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_ > > private.h > > index fe6ac3bc1b..32aec7782b 100644 > > --- a/src/intel/vulkan/anv_private.h > > +++ b/src/intel/vulkan/anv_private.h > > @@ -2071,6 +2071,45 @@ struct anv_image { > > struct anv_surface aux_surface; > > }; > > > > +/* Return whether or not the image has a color auxiliary buffer. */ > > +static inline bool > > +anv_image_has_color_aux(const struct anv_image * const image) > > +{ > > + assert(image); > > + > > + return image->aspects == VK_IMAGE_ASPECT_COLOR_BIT && > > + image->aux_surface.isl.size > 0; > > > > I'm not a big fan of conflating CCS and MCS. We do that in i965 today and > it's no end of pain. How about anv_image_has_ccs and restrict on sample > count as well? Same comment applies to the two below. > > </div></div>I'm not sure I understand your concern here, but I can create two functions instead. I think most of the callers of this function only care about whether or not there's a color buffer with CCS or MCS. (You can find more of the callers here: <a href="https://cgit.freedesktop.org/~nchery/mesa/log/?h=vk/perf/layout-ccsd-resolves-v3" rel="noreferrer" target="_blank">https://cgit.freedesktop.org/~nchery/mesa/log/?h=vk/perf/layout-ccsd-resolves-v3</a> ) </blockquote><div> </div><div>My concern is that "color aux" isn't really a useful thing. You could call it anv_image_has_aux and make it apply to everything, or we can make it specific in which case it should be has_ccs. Separating it into depth and color without splitting out MSAA is deceptive. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> > > +} > > + > > +/* Returns the number of auxiliary buffer levels attached to a color > > image. */ > > +static inline uint8_t > > +anv_color_aux_levels(const struct anv_image * const image) > > +{ > > + assert(image && image->aspects == VK_IMAGE_ASPECT_COLOR_BIT); > > + return anv_image_has_color_aux(image) ? image->aux_surface.isl.levels > > : 0; > > > > Is there some reason why we can't or shouldn't assert anv_image_has_ccs? I > haven't read all of the users of these helpers so maybe there's something > really useful about having them silently return 0. > > We did previously. With your suggestion of returning 0 in the below function, I thought that it would make sense to give this function the same behavior. </blockquote><div> </div><div>If I've managed go suggest that we do it both ways, then I clearly don't care. Let's just go with what you have here. As stated above, making it anv_image_aux_levels instead of mentioning color would be good though. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> > > +} > > + > > +/* Returns the number of auxiliary buffer layers attached to a color > > image. */ > > +static inline uint32_t > > +anv_color_aux_layers(const struct anv_image * const image, > > + const uint8_t miplevel) > > +{ > > + assert(image && image->aspects == VK_IMAGE_ASPECT_COLOR_BIT); > > + > > + /* The miplevel must exist in the main buffer. */ > > + assert(miplevel < image->levels); > > > > Similarly can we or should we assert that miplevel < anv_color_aux_levels()? > > I'm confused, you suggested that we return 0 in your previous review of this patch. <div class="HOEnZb"><div class="h5"> > > + > > + if (miplevel >= anv_color_aux_levels(image)) { > > + /* There are no layers with auxiliary data because the miplevel has > > no > > + * auxiliary data. > > + */ > > + return 0; > > + } else { > > + return MAX2(image->aux_surface.isl.logical_level0_px.array_len, > > + image->aux_surface.isl.logical_level0_px.depth >> > > miplevel); > > + } > > +} > > + > > /* Returns true if a HiZ-enabled depth buffer can be sampled from. */ > > static inline bool > > anv_can_sample_with_hiz(const struct gen_device_info * const devinfo, > > -- > > 2.13.1 > > > > _______________________________________________ > > mesa-dev mailing list > > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > > <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> > > </div></div></blockquote></div> </div></div>