Fix image aspect handling in fragdepth tests

The tests were creating a view which only used the depth aspect, but one
layout transition was incorrectly including the stencil aspect, leading
to validation errors.

Components: Vulkan
Affects: dEQP-VK.glsl.builtin_var.fragdepth.*

Change-Id: Ib2c1bcbce239968dfa21cc9ce5ef93c018189be9

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
index 5574e8d..a6d8235 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
@@ -636,10 +636,6 @@ TestStatus BuiltinFragDepthCaseInstance::iterate (void)
 
        // Initialize Marker Buffer
        {
-               VkImageAspectFlags      depthImageAspectFlags = VK_IMAGE_ASPECT_DEPTH_BIT;
-               if (hasStencilComponent(mapVkFormat(m_format).order))
-                       depthImageAspectFlags |= VK_IMAGE_ASPECT_STENCIL_BIT;
-
                const VkImageMemoryBarrier imageBarrier[] =
                {
                        {
@@ -798,10 +794,6 @@ TestStatus BuiltinFragDepthCaseInstance::iterate (void)
 
        // Barrier to transition between first and second pass
        {
-               VkImageAspectFlags      depthImageAspectFlags = VK_IMAGE_ASPECT_DEPTH_BIT;
-               if (hasStencilComponent(mapVkFormat(m_format).order))
-                       depthImageAspectFlags |= VK_IMAGE_ASPECT_STENCIL_BIT;
-
                const VkImageMemoryBarrier imageBarrier[] =
                {
                        {
@@ -815,7 +807,7 @@ TestStatus BuiltinFragDepthCaseInstance::iterate (void)
                                0u,                                                                                                                     // deUint32                             dstQueueFamilyIndex
                                *depthImage,                                                                                            // VkImage                              image
                                {
-                                       depthImageAspectFlags,                                                  // VkImageAspectFlags           aspectMask
+                                       VK_IMAGE_ASPECT_DEPTH_BIT,                                              // VkImageAspectFlags           aspectMask
                                        0u,                                                                                             // deUint32                                     baseMipLevel
                                        1u,                                                                                             // deUint32                                     levelCount
                                        0u,                                                                                             // deUint32                                     baseArrayLayer