From a33a4397435fb89d98a1cecc71d01bff66acaf8d Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Fri, 5 Aug 2016 09:38:18 -0600 Subject: layers: Reenable fix for DS layout transitions Fix for GH650, plus added fix for cube/tri. Change-Id: I66c2332c30eb34a0f022c033efd9b1c5b8284c32 --- layers/core_validation.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 5134aea9..0e82d05f 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3598,10 +3598,11 @@ void SetLayout(const layer_data *dev_data, GLOBAL_CB_NODE *pCB, VkImageView imag // TODO: If ImageView was created with depth or stencil, transition both layouts as // the aspectMask is ignored and both are used. Verify that the extra implicit layout // is OK for descriptor set layout validation - // TODO : Temporarily disabling this workaround as it breaks cube/tri --validate -// if (subRange.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { -// sub.aspectMask |= (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); -// } + if (subRange.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { + if (vk_format_is_depth_and_stencil(iv_data->format)) { + sub.aspectMask |= (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); + } + } SetLayout(pCB, image, sub, layout); } } -- cgit v1.2.3