commit 1ed2b7b98495e65231cbc6b96c377dd0f86d7a5c
author Yiwei Zhang <zzyiwei@google.com> Tue Aug 31 07:21:52 2021 +0000
committer Yiwei Zhang <zzyiwei@google.com> Tue Aug 31 18:07:52 2021 +0000
tree 1ab01f1d5e70486b70a68f91865ec3545c08b9c9
parent 692d84644c93c20ba17cf97461fc13195bc4cfd9

VulkanTestHelpers: enable sampler ycbcr conversion feature

Test: run without validation error
Change-Id: Id36f290df86e14289d82b0c0898649083e18364e

tests/tests/graphics/jni/VulkanTestHelpers.cpp

diff --git a/tests/tests/graphics/jni/VulkanTestHelpers.cpp b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
index ea16aea..89049e0 100644
--- a/tests/tests/graphics/jni/VulkanTestHelpers.cpp
+++ b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
@@ -121,6 +121,18 @@
   ASSERT(status == VK_SUCCESS || status == VK_INCOMPLETE);
   ASSERT(gpuCount > 0);
 
+  VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR ycbcrFeatures = {
+      .sType =
+          VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR,
+      .pNext = nullptr,
+  };
+  VkPhysicalDeviceFeatures2KHR physicalDeviceFeatures = {
+      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR,
+      .pNext = &ycbcrFeatures,
+  };
+  vkGetPhysicalDeviceFeatures2(mGpu, &physicalDeviceFeatures);
+  ASSERT(ycbcrFeatures.samplerYcbcrConversion == VK_TRUE);
+
   VkPhysicalDeviceProperties physicalDeviceProperties;
   vkGetPhysicalDeviceProperties(mGpu, &physicalDeviceProperties);
   std::vector<const char *> deviceExt;
@@ -182,7 +194,7 @@
 
   VkDeviceCreateInfo deviceCreateInfo{
       .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
-      .pNext = nullptr,
+      .pNext = &ycbcrFeatures,
       .queueCreateInfoCount = 1,
       .pQueueCreateInfos = &queueCreateInfo,
       .enabledLayerCount = 0,
@@ -226,18 +238,6 @@
           (PFN_vkImportSemaphoreFdKHR)vkGetDeviceProcAddr(mDevice, "vkImportSemaphoreFdKHR");
   ASSERT(mPfnImportSemaphoreFd);
 
-  VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR ycbcrFeatures{
-      .sType =
-          VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR,
-      .pNext = nullptr,
-  };
-  VkPhysicalDeviceFeatures2KHR physicalDeviceFeatures{
-      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR,
-      .pNext = &ycbcrFeatures,
-  };
-  vkGetPhysicalDeviceFeatures2(mGpu, &physicalDeviceFeatures);
-  ASSERT(ycbcrFeatures.samplerYcbcrConversion == VK_TRUE);
-
   vkGetDeviceQueue(mDevice, 0, 0, &mQueue);
   vkGetPhysicalDeviceMemoryProperties(mGpu, &mMemoryProperties);