From d13b9a93bc85f9b3917b44792fb5e1efcdb0202c Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Sat, 31 Dec 2022 10:27:10 +0100 Subject: [PATCH] Replaced outdated android layer names --- examples/computeheadless/computeheadless.cpp | 9 ++------- examples/renderheadless/renderheadless.cpp | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/examples/computeheadless/computeheadless.cpp b/examples/computeheadless/computeheadless.cpp index d6996f0c..48b04b06 100644 --- a/examples/computeheadless/computeheadless.cpp +++ b/examples/computeheadless/computeheadless.cpp @@ -144,14 +144,9 @@ public: instanceCreateInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instanceCreateInfo.pApplicationInfo = &appInfo; - uint32_t layerCount = 0; -#if defined(VK_USE_PLATFORM_ANDROID_KHR) - const char* validationLayers[] = { "VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_LUNARG_object_tracker","VK_LAYER_LUNARG_core_validation", "VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects" }; - layerCount = 6; -#else + uint32_t layerCount = 1; const char* validationLayers[] = { "VK_LAYER_KHRONOS_validation" }; - layerCount = 1; -#endif + std::vector instanceExtensions = {}; #if DEBUG // Check if layers are available diff --git a/examples/renderheadless/renderheadless.cpp b/examples/renderheadless/renderheadless.cpp index 5f1d80f1..920eaeb5 100644 --- a/examples/renderheadless/renderheadless.cpp +++ b/examples/renderheadless/renderheadless.cpp @@ -176,14 +176,9 @@ public: instanceCreateInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instanceCreateInfo.pApplicationInfo = &appInfo; - uint32_t layerCount = 0; -#if defined(VK_USE_PLATFORM_ANDROID_KHR) - const char* validationLayers[] = { "VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_LUNARG_object_tracker","VK_LAYER_LUNARG_core_validation", "VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects" }; - layerCount = 6; -#else + uint32_t layerCount = 1; const char* validationLayers[] = { "VK_LAYER_KHRONOS_validation" }; - layerCount = 1; -#endif + std::vector instanceExtensions = {}; #if DEBUG // Check if layers are available