From: Mark Young Date: Fri, 7 Jan 2022 21:27:26 +0000 (-0700) Subject: Fix a few code review snippets X-Git-Tag: upstream/v1.3.207~110 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=232c6977d2017442dec6abe78fd62222f8d0a333;p=platform%2Fupstream%2FVulkan-Loader.git Fix a few code review snippets Messages weren't clear on some errors, and rework the library ending code based on @charles-lunarg suggestions --- diff --git a/loader/terminator.c b/loader/terminator.c index 10fd13a8..1d79098e 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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceFeatures2 = icd_term->dispatch.GetPhysicalDeviceFeatures2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceFeatures2 = icd_term->dispatch.GetPhysicalDeviceFeatures2KHR; @@ -187,7 +187,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceProperties2 = icd_term->dispatch.GetPhysicalDeviceProperties2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceProperties2 = icd_term->dispatch.GetPhysicalDeviceProperties2KHR; @@ -249,7 +249,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceFormatProperties2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceFormatProperties2KHR; @@ -286,7 +286,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceImageFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceImageFormatProperties2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceImageFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceImageFormatProperties2KHR; @@ -325,7 +325,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceQueueFamilyProperties2 = icd_term->dispatch.GetPhysicalDeviceQueueFamilyProperties2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceQueueFamilyProperties2 = icd_term->dispatch.GetPhysicalDeviceQueueFamilyProperties2KHR; @@ -382,7 +382,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceMemoryProperties2 = icd_term->dispatch.GetPhysicalDeviceMemoryProperties2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceMemoryProperties2 = icd_term->dispatch.GetPhysicalDeviceMemoryProperties2KHR; @@ -419,7 +419,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceSparseImageFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceSparseImageFormatProperties2; } else if (inst->enabled_known_extensions.khr_get_physical_device_properties2) { fpGetPhysicalDeviceSparseImageFormatProperties2 = icd_term->dispatch.GetPhysicalDeviceSparseImageFormatProperties2KHR; @@ -487,13 +487,13 @@ 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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceExternalBufferProperties = icd_term->dispatch.GetPhysicalDeviceExternalBufferProperties; } else if (inst->enabled_known_extensions.khr_external_memory_capabilities) { fpGetPhysicalDeviceExternalBufferProperties = icd_term->dispatch.GetPhysicalDeviceExternalBufferPropertiesKHR; } - if (fpGetPhysicalDeviceExternalBufferProperties) { + if (fpGetPhysicalDeviceExternalBufferProperties != NULL) { // Pass the call to the driver fpGetPhysicalDeviceExternalBufferProperties(phys_dev_term->phys_dev, pExternalBufferInfo, pExternalBufferProperties); } else { @@ -529,7 +529,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceExternalSemaphoreProperties = icd_term->dispatch.GetPhysicalDeviceExternalSemaphoreProperties; } else if (inst->enabled_known_extensions.khr_external_semaphore_capabilities) { fpGetPhysicalDeviceExternalSemaphoreProperties = icd_term->dispatch.GetPhysicalDeviceExternalSemaphorePropertiesKHR; @@ -574,7 +574,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_major_version >= 1) { + if (inst->app_api_major_version > 1 || inst->app_api_minor_version >= 1) { fpGetPhysicalDeviceExternalFenceProperties = icd_term->dispatch.GetPhysicalDeviceExternalFenceProperties; } else if (inst->enabled_known_extensions.khr_external_fence_capabilities) { fpGetPhysicalDeviceExternalFenceProperties = icd_term->dispatch.GetPhysicalDeviceExternalFencePropertiesKHR; diff --git a/loader/wsi.c b/loader/wsi.c index f7fb1672..777fa551 100644 --- a/loader/wsi.c +++ b/loader/wsi.c @@ -246,7 +246,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceSupportKHR(VkP if (NULL == icd_term->dispatch.GetPhysicalDeviceSurfaceSupportKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceSurfaceSupportKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceSupportKHR!\n"); abort(); } @@ -298,7 +298,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceCapabilitiesKH if (NULL == icd_term->dispatch.GetPhysicalDeviceSurfaceCapabilitiesKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceSurfaceCapabilitiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceCapabilitiesKHR!\n"); abort(); } @@ -352,7 +352,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormatsKHR(VkP if (NULL == icd_term->dispatch.GetPhysicalDeviceSurfaceFormatsKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceSurfaceCapabilitiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceCapabilitiesKHR!\n"); abort(); } @@ -408,7 +408,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfacePresentModesKH if (NULL == icd_term->dispatch.GetPhysicalDeviceSurfacePresentModesKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceSurfacePresentModesKHR!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceSurfacePresentModesKHR!\n"); abort(); } @@ -645,7 +645,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceWin32PresentationSupp if (NULL == icd_term->dispatch.GetPhysicalDeviceWin32PresentationSupportKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceWin32PresentationSupportKHR!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceWin32PresentationSupportKHR!\n"); abort(); } @@ -765,7 +765,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceWaylandPresentationSu if (NULL == icd_term->dispatch.GetPhysicalDeviceWaylandPresentationSupportKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceWaylandPresentationSupportKHR!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceWaylandPresentationSupportKHR!\n"); abort(); } @@ -887,7 +887,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceXcbPresentationSuppor if (NULL == icd_term->dispatch.GetPhysicalDeviceXcbPresentationSupportKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceXcbPresentationSupportKHR!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceXcbPresentationSupportKHR!\n"); abort(); } @@ -1008,7 +1008,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceXlibPresentationSuppo if (NULL == icd_term->dispatch.GetPhysicalDeviceXlibPresentationSupportKHR) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceXlibPresentationSupportKHR!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceXlibPresentationSupportKHR!\n"); abort(); } @@ -1132,7 +1132,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceDirectFBPresentationS if (NULL == icd_term->dispatch.GetPhysicalDeviceDirectFBPresentationSupportEXT) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceDirectFBPresentationSupportEXT!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceDirectFBPresentationSupportEXT!\n"); abort(); } @@ -1647,7 +1647,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceScreenPresentationSup if (NULL == icd_term->dispatch.GetPhysicalDeviceScreenPresentationSupportQNX) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceScreenPresentationSupportQNX!\n"); + "ICD for selected physical device does not exportvkGetPhysicalDeviceScreenPresentationSupportQNX!\n"); abort(); } @@ -1687,7 +1687,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceDisplayPropertiesKHR( if (NULL == icd_term->dispatch.GetPhysicalDeviceDisplayPropertiesKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceDisplayPropertiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceDisplayPropertiesKHR!\n"); *pPropertyCount = 0; return VK_SUCCESS; } @@ -1725,7 +1725,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceDisplayPlanePropertie if (NULL == icd_term->dispatch.GetPhysicalDeviceDisplayPlanePropertiesKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device is not exporting vkGetPhysicalDeviceDisplayPlanePropertiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceDisplayPlanePropertiesKHR!\n"); *pPropertyCount = 0; return VK_SUCCESS; } @@ -1763,7 +1763,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetDisplayPlaneSupportedDisplaysKHR(Vk if (NULL == icd_term->dispatch.GetDisplayPlaneSupportedDisplaysKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device is not exporting vkGetDisplayPlaneSupportedDisplaysKHR!\n"); + "ICD for selected physical device does not export vkGetDisplayPlaneSupportedDisplaysKHR!\n"); *pDisplayCount = 0; return VK_SUCCESS; } @@ -1802,7 +1802,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetDisplayModePropertiesKHR(VkPhysical if (NULL == icd_term->dispatch.GetDisplayModePropertiesKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device is not exporting vkGetDisplayModePropertiesKHR!\n"); + "ICD for selected physical device does not export vkGetDisplayModePropertiesKHR!\n"); *pPropertyCount = 0; return VK_SUCCESS; } @@ -1843,7 +1843,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDisplayModeKHR(VkPhysicalDevice if (NULL == icd_term->dispatch.CreateDisplayModeKHR) { // Can't emulate, so return an appropriate error loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device is not exporting vkCreateDisplayModeKHR!\n"); + "ICD for selected physical device does not export vkCreateDisplayModeKHR!\n"); return VK_ERROR_INITIALIZATION_FAILED; } @@ -1882,7 +1882,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetDisplayPlaneCapabilitiesKHR(VkPhysi if (NULL == icd_term->dispatch.GetDisplayPlaneCapabilitiesKHR) { // Emulate support loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device is not exporting vkGetDisplayPlaneCapabilitiesKHR!\n"); + "ICD for selected physical device does not export vkGetDisplayPlaneCapabilitiesKHR!\n"); if (pCapabilities) { memset(pCapabilities, 0, sizeof(VkDisplayPlaneCapabilitiesKHR)); } diff --git a/tests/framework/test_environment.cpp b/tests/framework/test_environment.cpp index 65cd070b..2a164ebe 100644 --- a/tests/framework/test_environment.cpp +++ b/tests/framework/test_environment.cpp @@ -216,21 +216,16 @@ void FrameworkEnvironment::add_layer_impl(ManifestLayer& layer_manifest, const s // Strip off ending #if defined(WIN32) - size_t index = 0; - index = wrap_layer.find(".dll", index); - assert(index != std::string::npos); - wrap_layer.replace(index, 4, ""); + std::string library_extension = ".dll"; #elif defined(__APPLE__) - size_t index = 0; - index = wrap_layer.find(".dylib", index); - assert(index != std::string::npos); - wrap_layer.replace(index, 6, ""); + std::string library_extension = ".dylib"; #else + std::string library_extension = ".so"; +#endif size_t index = 0; - index = wrap_layer.find(".so", index); + index = wrap_layer.find(library_extension, index); assert(index != std::string::npos); - wrap_layer.replace(index, 3, ""); -#endif + wrap_layer.replace(index, library_extension.size(), ""); for (auto& layer : layer_manifest.layers) { size_t cur_layer_index = layers.size();