Fix merge error in FSR srlayered tests
Reapply last chunk from 853897a8722 which seems to
have been broken in a merge: layercount value was passed
instead of viewFormatCount.
This is fixes a regression introduced by 10618, which was exposed
after being promoted to vulkan-cts-1.2.8+.
Components: Vulkan
VK-GL-CTS Issue: 4224
VK-GL-CTS Issue: 4226
Affects: dEQP-VK.fragment_shading_rate.*
Change-Id: Ib8f5b180368fe9bf3c32f349c2475a4932f30fbf
diff --git a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
index 77ae977..9f7e9d3 100644
--- a/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
+++ b/external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
@@ -1253,7 +1253,7 @@
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;
@@ -1567,8 +1567,8 @@
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;
}
);