From: Aidan Fabius <aidan.fabius@coreavi.com>
Date: Tue, 10 May 2022 23:01:51 +0000 (-0400)
Subject: Fixed YCbCr conversion tests in Vulkan SC
X-Git-Tag: upstream/1.3.5~80^2~3^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8c8a8df7a6b04c70caed1beff6307dfec871386;p=platform%2Fupstream%2FVK-GL-CTS.git

Fixed YCbCr conversion tests in Vulkan SC

Main process was skipping calls to uploadImage/fillImageMemory that
create an additional VkCommandPool that wasn't accounted for in the
subprocess memory reservation.

Affects:

dEQP-VKSC.ycbcr.conversion.*

Change-Id: If438ff06af67895209a08f8b0eaeb3fc46514a29
---

diff --git a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp
index 41adcb7..4b8b380 100644
--- a/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp
+++ b/external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp
@@ -562,15 +562,11 @@ void evalShader (Context&												context,
 	const ShaderSpec									spec				(createShaderSpec(samplerBinding, colorModels));
 	const de::UniquePtr<ShaderExecutor>					executor			(createExecutor(context, shaderType, spec, *layout));
 
-#ifdef CTS_USES_VULKANSC
-	if (context.getTestContext().getCommandLine().isSubProcess())
-#endif // CTS_USES_VULKANSC
-	{
-		if (imageTiling == vk::VK_IMAGE_TILING_OPTIMAL)
-			uploadImage(vkd, device, context.getUniversalQueueFamilyIndex(), context.getDefaultAllocator(), *image, imageData, vk::VK_ACCESS_SHADER_READ_BIT, vk::VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-		else
-			fillImageMemory(vkd, device, context.getUniversalQueueFamilyIndex(), *image, imageMemory, imageData, vk::VK_ACCESS_SHADER_READ_BIT, vk::VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-	}
+	if (imageTiling == vk::VK_IMAGE_TILING_OPTIMAL)
+		uploadImage(vkd, device, context.getUniversalQueueFamilyIndex(), context.getDefaultAllocator(), *image, imageData, vk::VK_ACCESS_SHADER_READ_BIT, vk::VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+	else
+		fillImageMemory(vkd, device, context.getUniversalQueueFamilyIndex(), *image, imageMemory, imageData, vk::VK_ACCESS_SHADER_READ_BIT, vk::VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+
 	for(int i=0; i<(int)results.size(); i++)
 		results[i].resize(sts.size());