Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / fragment_shading_rate / vktFragmentShadingRateBasic.cpp

diff --git a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
index 4e21315..113c081 100644 (file)
--- a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
+++ b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
@@ -1497,7 +1497,7 @@ tcu::TestStatus FSRTestInstance::iterate (void)
                        deUint32 srFillBpp = tcu::getPixelSize(mapVkFormat(srFormat));
 
                        VkImageLayout   srLayout        = modeIdx == ATTACHMENT_MODE_LAYOUT_OPTIMAL ? VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR : VK_IMAGE_LAYOUT_GENERAL;
-                       VkImageViewType srViewType      = (modeIdx == ATTACHMENT_MODE_2DARRAY || numSRLayers > 1u) ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D;
+                       VkImageViewType srViewType      = modeIdx == ATTACHMENT_MODE_2DARRAY ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D;
                        VkImageTiling   srTiling        = (modeIdx == ATTACHMENT_MODE_TILING_LINEAR) ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
 
                        VkFormatProperties srFormatProperties;
@@ -1838,8 +1838,8 @@ tcu::TestStatus FSRTestInstance::iterate (void)
                                                srUsage,                                                                                                        //  VkImageUsageFlags   usage;
                                                srWidth,                                                                                                        //  deUint32                    width;
                                                srHeight,                                                                                                       //  deUint32                    height;
-                                               numSRLayers,                                                                                            //  deUint32                    layerCount;
-                                               srViewType == VK_IMAGE_VIEW_TYPE_2D ? 1 : numSRLayers,          //  deUint32                    viewFormatCount;
+                                               srViewType == VK_IMAGE_VIEW_TYPE_2D ? 1 : numSRLayers,          //  deUint32                    layerCount;
+                                               1u,                                                                                                                     //  deUint32                    viewFormatCount;
                                                &srFormat                                                                                                       //  const VkFormat*             pViewFormats;
                                        }
                                        );