From 6f5ce368772804b8b37b88740ceaf55384588835 Mon Sep 17 00:00:00 2001 From: Dmitry Skvortsov Date: Fri, 25 Mar 2022 19:33:30 +0300 Subject: [PATCH] relax requirements for app_api_major_version --- loader/terminator.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/loader/terminator.c b/loader/terminator.c index 5b890f725..d55d8e67d 100644 --- a/loader/terminator.c +++ b/loader/terminator.c @@ -132,7 +132,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceFeatures2(VkPhysicalDevic // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceFeatures2 fpGetPhysicalDeviceFeatures2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceFeatures2 = icd_term->dispatch.GetPhysicalDeviceFeatures2; } if (fpGetPhysicalDeviceFeatures2 == NULL && inst->enabled_known_extensions.khr_get_physical_device_properties2) { @@ -188,7 +188,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceProperties2(VkPhysicalDev // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceProperties2 fpGetPhysicalDeviceProperties2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceProperties2 = icd_term->dispatch.GetPhysicalDeviceProperties2; } if (fpGetPhysicalDeviceProperties2 == NULL && inst->enabled_known_extensions.khr_get_physical_device_properties2) { @@ -251,7 +251,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceFormatProperties2(VkPhysi // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceFormatProperties2 fpGetPhysicalDeviceFormatProperties2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceFormatProperties2; } if (fpGetPhysicalDeviceFormatProperties2 == NULL && inst->enabled_known_extensions.khr_get_physical_device_properties2) { @@ -289,7 +289,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceImageFormatProperties // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceImageFormatProperties2 fpGetPhysicalDeviceImageFormatProperties2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceImageFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceImageFormatProperties2; } if (fpGetPhysicalDeviceImageFormatProperties2 == NULL && inst->enabled_known_extensions.khr_get_physical_device_properties2) { @@ -329,7 +329,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceQueueFamilyProperties2(Vk // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceQueueFamilyProperties2 fpGetPhysicalDeviceQueueFamilyProperties2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceQueueFamilyProperties2 = icd_term->dispatch.GetPhysicalDeviceQueueFamilyProperties2; } if (fpGetPhysicalDeviceQueueFamilyProperties2 == NULL && inst->enabled_known_extensions.khr_get_physical_device_properties2) { @@ -387,7 +387,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceMemoryProperties2(VkPhysi // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceMemoryProperties2 fpGetPhysicalDeviceMemoryProperties2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceMemoryProperties2 = icd_term->dispatch.GetPhysicalDeviceMemoryProperties2; } if (fpGetPhysicalDeviceMemoryProperties2 == NULL && inst->enabled_known_extensions.khr_get_physical_device_properties2) { @@ -425,7 +425,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceSparseImageFormatProperti // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 fpGetPhysicalDeviceSparseImageFormatProperties2 = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceSparseImageFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceSparseImageFormatProperties2; } if (fpGetPhysicalDeviceSparseImageFormatProperties2 == NULL && @@ -495,7 +495,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceExternalBufferProperties( // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceExternalBufferProperties fpGetPhysicalDeviceExternalBufferProperties = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceExternalBufferProperties = icd_term->dispatch.GetPhysicalDeviceExternalBufferProperties; } if (fpGetPhysicalDeviceExternalBufferProperties == NULL && inst->enabled_known_extensions.khr_external_memory_capabilities) { @@ -538,7 +538,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceExternalSemaphoreProperti // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceExternalSemaphoreProperties fpGetPhysicalDeviceExternalSemaphoreProperties = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceExternalSemaphoreProperties = icd_term->dispatch.GetPhysicalDeviceExternalSemaphoreProperties; } if (fpGetPhysicalDeviceExternalSemaphoreProperties == NULL && @@ -585,7 +585,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceExternalFenceProperties( // Get the function pointer to use to call into the ICD. This could be the core or KHR version PFN_vkGetPhysicalDeviceExternalFenceProperties fpGetPhysicalDeviceExternalFenceProperties = NULL; - if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { + if (inst->app_api_major_version >= 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceExternalFenceProperties = icd_term->dispatch.GetPhysicalDeviceExternalFenceProperties; } if (fpGetPhysicalDeviceExternalFenceProperties == NULL && inst->enabled_known_extensions.khr_external_fence_capabilities) { -- 2.35.1