Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
On Mon, Feb 27, 2017 at 8:00 AM, Dave Airlie <airl...@gmail.com> wrote: > From: Dave Airlie <airl...@redhat.com> > > For blitting we need to use the depth or stencil format, never > the combined. > > This fixes: > dEQP-VK.texture.shadow.2d.nearest.less_or_equal_d32_sfloat_s8_uint > and a few others. > > Cc: "13.0 17.0" <mesa-sta...@lists.freedesktop.org> > Signed-off-by: Dave Airlie <airl...@redhat.com> > --- > src/amd/vulkan/radv_meta_blit2d.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/src/amd/vulkan/radv_meta_blit2d.c > b/src/amd/vulkan/radv_meta_blit2d.c > index 6b622e7..225b4b2 100644 > --- a/src/amd/vulkan/radv_meta_blit2d.c > +++ b/src/amd/vulkan/radv_meta_blit2d.c > @@ -26,6 +26,7 @@ > > #include "radv_meta.h" > #include "nir/nir_builder.h" > +#include "vk_format.h" > > enum blit2d_dst_type { > /* We can bind this destination as a "normal" render target and render > @@ -283,8 +284,10 @@ radv_meta_blit2d_normal_dst(struct radv_cmd_buffer > *cmd_buffer, > > for (unsigned r = 0; r < num_rects; ++r) { > VkFormat depth_format = 0; > - if (dst->aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) > - depth_format = dst->image->vk_format; > + if (dst->aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) > + depth_format = > vk_format_stencil_only(dst->image->vk_format); > + else if (dst->aspect_mask == VK_IMAGE_ASPECT_DEPTH_BIT) > + depth_format = > vk_format_depth_only(dst->image->vk_format); > struct blit2d_src_temps src_temps; > blit2d_bind_src(cmd_buffer, src_img, src_buf, &src_temps, > src_type, depth_format); > > -- > 2.9.3 > > _______________________________________________ > 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