<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Tue, Oct 4, 2016 at 3:48 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, Oct 03, 2016 at 04:27:53PM -0700, Jason Ekstrand wrote: > On Mon, Sep 26, 2016 at 5:10 PM, Nanley Chery <<a href="mailto:nanleychery@gmail.com">nanleychery@gmail.com</a>> wrote: > > > From: Chad Versace <<a href="mailto:chad.versace@intel.com">chad.versace@intel.com</a>> > > > > Nanley Chery: > > (rebase) > > - Use isl_surf_get_hiz_surf() > > (amend) > > - Only add a HiZ surface onto a depth/stencil attachment > > - Add comment above HiZ surface addition > > - Hide HiZ behind INTEL_VK_HIZ prior to BDW > > - Disable HiZ for untested cases > > - Remove DISABLE_AUX_BIT instead of preventing it from being added > > > > Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>> > > Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> > > Reviewed-by: Chad Versace <<a href="mailto:chadversary@chromium.org">chadversary@chromium.org</a>> (v1) > > > > --- > > > > v2: Disable certain HiZ cases here (Jason) > > > > src/intel/vulkan/anv_image.c | 39 ++++++++++++++++++++++++++++++++++++--- > > 1 file changed, 36 insertions(+), 3 deletions(-) > > > > diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c > > index f6e8672..d408819 100644 > > --- a/src/intel/vulkan/anv_image.c > > +++ b/src/intel/vulkan/anv_image.c > > @@ -28,6 +28,7 @@ > > #include <fcntl.h> > > > > #include "anv_private.h" > > +#include "util/debug.h" > > > > #include "vk_format_info.h" > > > > @@ -60,6 +61,7 @@ choose_isl_surf_usage(VkImageUsageFlags vk_usage, > > default: > > unreachable("bad VkImageAspect"); > > case VK_IMAGE_ASPECT_DEPTH_BIT: > > + isl_usage &= ~ISL_SURF_USAGE_DISABLE_AUX_BIT; > > isl_usage |= ISL_SURF_USAGE_DEPTH_BIT; > > break; > > case VK_IMAGE_ASPECT_STENCIL_BIT: > > @@ -99,6 +101,16 @@ get_surface(struct anv_image *image, > > VkImageAspectFlags aspect) > > } > > } > > > > +static void > > +add_surface(struct anv_image *image, struct anv_surface *surf) > > +{ > > + assert(surf->isl.size > 0); /* isl surface must be initialized */ > > + > > + surf->offset = align_u32(image->size, surf->isl.alignment); > > + image->size = surf->offset + surf->isl.size; > > + image->alignment = MAX(image->alignment, surf->isl.alignment); > > +} > > + > > /** > > * Initialize the anv_image::*_surface selected by \a aspect. Then update > > the > > * image's memory requirements (that is, the image's size and alignment). > > @@ -160,9 +172,30 @@ make_surface(const struct anv_device *dev, > > */ > > assert(ok); > > > > - anv_surf->offset = align_u32(image->size, anv_surf->isl.alignment); > > - image->size = anv_surf->offset + anv_surf->isl.size; > > - image->alignment = MAX(image->alignment, anv_surf->isl.alignment); > > + add_surface(image, anv_surf); > > > > In my CCS series, I split this in two and had a precursor patch that added > the add_surface helper. Do with that information what you will. I'm fine > with having it all in one patch. > > > > + > > + /* Allow the user to control HiZ enabling. Disable by default on gen7 > > + * because resolves are not currently implemented pre-BDW. > > + */ > > + if (!env_var_as_boolean("INTEL_VK_HIZ", dev->info.gen >= 8)) { > > + anv_finishme("Implement gen7 HiZ"); > > + return VK_SUCCESS; > > + } else if (vk_info->mipLevels > 1) { > > + anv_finishme("Test multi-LOD HiZ"); > > + return VK_SUCCESS; > > + } else if (dev->info.gen == 8 && vk_info->samples > 1) { > > + anv_finishme("Test gen8 multisampled HiZ"); > > + return VK_SUCCESS; > > + } > > > > It may be better to pull this (and the usage check below) into an > image_supports_hiz helper. The early returns work for now but as soon as > we have multiple kinds of aux surfaces, we'll have to do that refactor > anyway. > > </div></div>I'll nest the hunk above into the following if statement. That should prevent conflicts with other aux surfaces. </blockquote><div> </div><div>I suppose that works. If it's a problem, we can always do that refactor later. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> > > + > > + /* Add a HiZ surface to a depth buffer that will be used for rendering. > > + */ > > + if (aspect == VK_IMAGE_ASPECT_DEPTH_BIT && > > + (image->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) { -Nanley <div class="HOEnZb"><div class="h5"> > > + isl_surf_get_hiz_surf(&dev->isl_dev, &image->depth_surface.isl, > > + &image->hiz_surface.isl); > > + add_surface(image, &image->hiz_surface); > > + } > > > > return VK_SUCCESS; > > } > > -- > > 2.10.0 > > > > _______________________________________________ > > 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>