From 7bdc3452c68730420ed5b182d91ba04e0ee082ad Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Wed, 3 Aug 2016 20:30:07 -0600 Subject: layers: Disable previous fix for DS layout transitions Fix to always transition both depth and stencil aspects for DS images is causing errors on cube and tri. Disabling the fix and test for now to avoid unwanted false positives. --- layers/core_validation.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 7bc91f7d..5134aea9 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -3598,9 +3598,10 @@ 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 - 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); - } + // 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); +// } SetLayout(pCB, image, sub, layout); } } -- cgit v1.2.3