diff options
author | Charles Giessen <charles@lunarg.com> | 2023-01-30 12:22:08 -0700 |
---|---|---|
committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2023-01-30 13:10:21 -0700 |
commit | 3a799ab00eb287376f5ac9f21f8ce2851c9e348e (patch) | |
tree | 5a00f0bd7c80650ebe8bcb0f1d8de1e154d3f595 | |
parent | 11883676188f55a15c76433ba9eb02abb3384c5b (diff) | |
download | Vulkan-Loader-3a799ab00eb287376f5ac9f21f8ce2851c9e348e.tar.gz Vulkan-Loader-3a799ab00eb287376f5ac9f21f8ce2851c9e348e.tar.bz2 Vulkan-Loader-3a799ab00eb287376f5ac9f21f8ce2851c9e348e.zip |
Remove newlines in log messages
The loader_log() function adds a new line at the end of every log message.
Having the string contain an extra new line is redundant and makes the output
inconsistent due to having random blank lines.
-rw-r--r-- | loader/loader.c | 6 | ||||
-rw-r--r-- | loader/loader_windows.c | 12 | ||||
-rw-r--r-- | loader/wsi.c | 109 |
3 files changed, 63 insertions, 64 deletions
diff --git a/loader/loader.c b/loader/loader.c index b604dfc0..f32c90ca 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2818,7 +2818,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s str_len = strlen(cur_file) + 1; } if (str_len > sizeof(temp_path)) { - loader_log(inst, VULKAN_LOADER_DEBUG_BIT, 0, "add_data_files: Path to %s too long\n", cur_file); + loader_log(inst, VULKAN_LOADER_DEBUG_BIT, 0, "add_data_files: Path to %s too long", cur_file); continue; } strcpy(temp_path, cur_file); @@ -4723,7 +4723,7 @@ VkResult loader_create_instance_chain(const VkInstanceCreateInfo *pCreateInfo, c loader_log(inst, VULKAN_LOADER_LAYER_BIT, 0, " Library: %s", activated_layers[index].library); loader_log(inst, VULKAN_LOADER_LAYER_BIT, 0, " ||"); } - loader_log(inst, VULKAN_LOADER_LAYER_BIT, 0, " <Drivers>\n"); + loader_log(inst, VULKAN_LOADER_LAYER_BIT, 0, " <Drivers>"); } res = fpCreateInstance(&loader_create_info, pAllocator, created_instance); @@ -5791,7 +5791,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDevice(VkPhysicalDevice physical } loader_log(icd_term->this_instance, VULKAN_LOADER_LAYER_BIT | VULKAN_LOADER_DRIVER_BIT, 0, - " Using \"%s\" with driver: \"%s\"\n", properties.deviceName, icd_term->scanned_icd->lib_name); + " Using \"%s\" with driver: \"%s\"", properties.deviceName, icd_term->scanned_icd->lib_name); res = fpCreateDevice(phys_dev_term->phys_dev, &localCreateInfo, pAllocator, &dev->icd_device); if (res != VK_SUCCESS) { diff --git a/loader/loader_windows.c b/loader/loader_windows.c index db8b6910..5b0e9dc6 100644 --- a/loader/loader_windows.c +++ b/loader/loader_windows.c @@ -1013,7 +1013,7 @@ char *windows_get_app_package_manifest_path(const struct loader_instance *inst) if (ERROR_INSUFFICIENT_BUFFER != fpGetPackagesByPackageFamily(familyName, &numPackages, NULL, &bufferLength, NULL) || numPackages == 0 || bufferLength == 0) { loader_log(inst, VULKAN_LOADER_INFO_BIT, 0, - "windows_get_app_package_manifest_path: Failed to find mapping layers packages by family name\n"); + "windows_get_app_package_manifest_path: Failed to find mapping layers packages by family name"); return NULL; } @@ -1022,13 +1022,13 @@ char *windows_get_app_package_manifest_path(const struct loader_instance *inst) PWSTR *packages = loader_instance_heap_alloc(inst, sizeof(PWSTR) * numPackages, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); if (!buffer || !packages) { loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, - "windows_get_app_package_manifest_path: Failed to allocate memory for package names\n"); + "windows_get_app_package_manifest_path: Failed to allocate memory for package names"); goto cleanup; } if (ERROR_SUCCESS != fpGetPackagesByPackageFamily(familyName, &numPackages, packages, &bufferLength, buffer)) { loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, - "windows_get_app_package_manifest_path: Failed to mapping layers package full names\n"); + "windows_get_app_package_manifest_path: Failed to mapping layers package full names"); goto cleanup; } @@ -1038,20 +1038,20 @@ char *windows_get_app_package_manifest_path(const struct loader_instance *inst) if (ERROR_INSUFFICIENT_BUFFER != fpGetPackagePathByFullName(packages[0], &pathLength, NULL) || pathLength > MAX_PATH || ERROR_SUCCESS != fpGetPackagePathByFullName(packages[0], &pathLength, path)) { loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, - "windows_get_app_package_manifest_path: Failed to get mapping layers package path\n"); + "windows_get_app_package_manifest_path: Failed to get mapping layers package path"); goto cleanup; } int narrowPathLength = WideCharToMultiByte(CP_ACP, 0, path, -1, NULL, 0, NULL, NULL); if (narrowPathLength == 0) { loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, - "windows_get_app_package_manifest_path: Failed to convert path from wide to narrow\n"); + "windows_get_app_package_manifest_path: Failed to convert path from wide to narrow"); goto cleanup; } ret = loader_instance_heap_alloc(inst, narrowPathLength, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); if (!ret) { - loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, "windows_get_app_package_manifest_path: Failed to allocate path\n"); + loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, "windows_get_app_package_manifest_path: Failed to allocate path"); goto cleanup; } diff --git a/loader/wsi.c b/loader/wsi.c index 8a97ca59..4263efaa 100644 --- a/loader/wsi.c +++ b/loader/wsi.c @@ -239,13 +239,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceSupportKHR(VkP struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceSupportKHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceSupportKHR not executed!"); return VK_SUCCESS; } if (NULL == pSupported) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "NULL pointer passed into vkGetPhysicalDeviceSurfaceSupportKHR for pSupported!\n"); + "NULL pointer passed into vkGetPhysicalDeviceSurfaceSupportKHR for pSupported!"); abort(); } *pSupported = false; @@ -254,7 +254,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceSupportKHR(VkP // set pSupported to false as this driver doesn't support WSI functionality *pSupported = false; loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceSupportKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceSupportKHR!"); return VK_SUCCESS; } @@ -294,13 +294,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceCapabilitiesKH struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceCapabilitiesKHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceCapabilitiesKHR not executed!"); return VK_SUCCESS; } if (NULL == pSurfaceCapabilities) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "NULL pointer passed into vkGetPhysicalDeviceSurfaceCapabilitiesKHR for pSurfaceCapabilities!\n"); + "NULL pointer passed into vkGetPhysicalDeviceSurfaceCapabilitiesKHR for pSurfaceCapabilities!"); abort(); } @@ -308,7 +308,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceCapabilitiesKH // Zero out the capabilities as this driver doesn't support WSI functionality memset(pSurfaceCapabilities, 0, sizeof(VkSurfaceCapabilitiesKHR)); loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceCapabilitiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceCapabilitiesKHR!"); return VK_SUCCESS; } @@ -350,13 +350,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormatsKHR(VkP struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceFormatsKHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceFormatsKHR not executed!"); return VK_SUCCESS; } if (NULL == pSurfaceFormatCount) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "NULL pointer passed into vkGetPhysicalDeviceSurfaceFormatsKHR for pSurfaceFormatCount!\n"); + "NULL pointer passed into vkGetPhysicalDeviceSurfaceFormatsKHR for pSurfaceFormatCount!"); abort(); } @@ -364,7 +364,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormatsKHR(VkP // Zero out the format count as this driver doesn't support WSI functionality *pSurfaceFormatCount = 0; loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceCapabilitiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfaceCapabilitiesKHR!"); return VK_SUCCESS; } @@ -408,13 +408,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfacePresentModesKH struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfacePresentModesKHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfacePresentModesKHR not executed!"); return VK_SUCCESS; } if (NULL == pPresentModeCount) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "NULL pointer passed into vkGetPhysicalDeviceSurfacePresentModesKHR for pPresentModeCount!\n"); + "NULL pointer passed into vkGetPhysicalDeviceSurfacePresentModesKHR for pPresentModeCount!"); abort(); } @@ -422,7 +422,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfacePresentModesKH // Zero out the present mode count as this driver doesn't support WSI functionality *pPresentModeCount = 0; loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceSurfacePresentModesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceSurfacePresentModesKHR!"); return VK_SUCCESS; } @@ -602,7 +602,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateWin32SurfaceKHR(VkInstance insta struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_win32_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_win32_surface extension not enabled. vkCreateWin32SurfaceKHR not executed!\n"); + "VK_KHR_win32_surface extension not enabled. vkCreateWin32SurfaceKHR not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -678,14 +678,14 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceWin32PresentationSupp struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_win32_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_win32_surface extension not enabled. vkGetPhysicalDeviceWin32PresentationSupportKHR not executed!\n"); + "VK_KHR_win32_surface extension not enabled. vkGetPhysicalDeviceWin32PresentationSupportKHR not executed!"); return VK_FALSE; } if (NULL == icd_term->dispatch.GetPhysicalDeviceWin32PresentationSupportKHR) { // return VK_FALSE as this driver doesn't support WSI functionality loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceWin32PresentationSupportKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceWin32PresentationSupportKHR!"); return VK_FALSE; } @@ -721,7 +721,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateWaylandSurfaceKHR(VkInstance ins struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_wayland_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_wayland_surface extension not enabled. vkCreateWaylandSurfaceKHR not executed!\n"); + "VK_KHR_wayland_surface extension not enabled. vkCreateWaylandSurfaceKHR not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -798,16 +798,15 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceWaylandPresentationSu struct loader_icd_term *icd_term = phys_dev_term->this_icd_term; struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_wayland_surface_enabled) { - loader_log( - loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_wayland_surface extension not enabled. vkGetPhysicalDeviceWaylandPresentationSupportKHR not executed!\n"); + loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, + "VK_KHR_wayland_surface extension not enabled. vkGetPhysicalDeviceWaylandPresentationSupportKHR not executed!"); return VK_FALSE; } if (NULL == icd_term->dispatch.GetPhysicalDeviceWaylandPresentationSupportKHR) { // return VK_FALSE as this driver doesn't support WSI functionality loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceWaylandPresentationSupportKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceWaylandPresentationSupportKHR!"); return VK_FALSE; } @@ -844,7 +843,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateXcbSurfaceKHR(VkInstance instanc struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_xcb_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_xcb_surface extension not enabled. vkCreateXcbSurfaceKHR not executed!\n"); + "VK_KHR_xcb_surface extension not enabled. vkCreateXcbSurfaceKHR not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -924,14 +923,14 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceXcbPresentationSuppor struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_xcb_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_xcb_surface extension not enabled. vkGetPhysicalDeviceXcbPresentationSupportKHR not executed!\n"); + "VK_KHR_xcb_surface extension not enabled. vkGetPhysicalDeviceXcbPresentationSupportKHR not executed!"); return VK_FALSE; } if (NULL == icd_term->dispatch.GetPhysicalDeviceXcbPresentationSupportKHR) { // return VK_FALSE as this driver doesn't support WSI functionality loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceXcbPresentationSupportKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceXcbPresentationSupportKHR!"); return VK_FALSE; } @@ -969,7 +968,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateXlibSurfaceKHR(VkInstance instan struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_xlib_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_xlib_surface extension not enabled. vkCreateXlibSurfaceKHR not executed!\n"); + "VK_KHR_xlib_surface extension not enabled. vkCreateXlibSurfaceKHR not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -1047,14 +1046,14 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceXlibPresentationSuppo struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_xlib_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_xlib_surface extension not enabled. vkGetPhysicalDeviceXlibPresentationSupportKHR not executed!\n"); + "VK_KHR_xlib_surface extension not enabled. vkGetPhysicalDeviceXlibPresentationSupportKHR not executed!"); return VK_FALSE; } if (NULL == icd_term->dispatch.GetPhysicalDeviceXlibPresentationSupportKHR) { // return VK_FALSE as this driver doesn't support WSI functionality loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceXlibPresentationSupportKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceXlibPresentationSupportKHR!"); return VK_FALSE; } @@ -1093,7 +1092,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDirectFBSurfaceEXT(VkInstance in struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_directfb_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_EXT_directfb_surface extension not enabled. vkCreateDirectFBSurfaceEXT not executed!\n"); + "VK_EXT_directfb_surface extension not enabled. vkCreateDirectFBSurfaceEXT not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -1173,14 +1172,14 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceDirectFBPresentationS if (!loader_inst->wsi_directfb_surface_enabled) { loader_log( loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_EXT_directfb_surface extension not enabled. vkGetPhysicalDeviceDirectFBPresentationSupportKHR not executed!\n"); + "VK_EXT_directfb_surface extension not enabled. vkGetPhysicalDeviceDirectFBPresentationSupportKHR not executed!"); return VK_FALSE; } if (NULL == icd_term->dispatch.GetPhysicalDeviceDirectFBPresentationSupportEXT) { // return VK_FALSE as this driver doesn't support WSI functionality loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceDirectFBPresentationSupportEXT!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceDirectFBPresentationSupportEXT!"); return VK_FALSE; } @@ -1215,7 +1214,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateAndroidSurfaceKHR(VkInstance ins struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkCreateAndroidSurfaceKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkCreateAndroidSurfaceKHR not executed!"); return VK_ERROR_EXTENSION_NOT_PRESENT; } @@ -1263,7 +1262,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateHeadlessSurfaceEXT(VkInstance in if (!inst->wsi_headless_surface_enabled) { loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, "VK_EXT_headless_surface extension not enabled. " - "vkCreateHeadlessSurfaceEXT not executed!\n"); + "vkCreateHeadlessSurfaceEXT not executed!"); return VK_SUCCESS; } @@ -1338,7 +1337,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateMacOSSurfaceMVK(VkInstance insta struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_macos_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_MVK_macos_surface extension not enabled. vkCreateMacOSSurfaceMVK not executed!\n"); + "VK_MVK_macos_surface extension not enabled. vkCreateMacOSSurfaceMVK not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -1414,7 +1413,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateIOSSurfaceMVK(VkInstance instanc struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_ios_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_MVK_ios_surface extension not enabled. vkCreateIOSSurfaceMVK not executed!\n"); + "VK_MVK_ios_surface extension not enabled. vkCreateIOSSurfaceMVK not executed!"); return VK_ERROR_EXTENSION_NOT_PRESENT; } @@ -1466,7 +1465,7 @@ terminator_CreateStreamDescriptorSurfaceGGP(VkInstance instance, const VkStreamD struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_ggp_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_GGP_stream_descriptor_surface extension not enabled. vkCreateStreamDescriptorSurfaceGGP not executed!\n"); + "VK_GGP_stream_descriptor_surface extension not enabled. vkCreateStreamDescriptorSurfaceGGP not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -1541,7 +1540,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateMetalSurfaceEXT(VkInstance insta struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_metal_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_EXT_metal_surface extension not enabled. vkCreateMetalSurfaceEXT will not be executed.\n"); + "VK_EXT_metal_surface extension not enabled. vkCreateMetalSurfaceEXT will not be executed."); } // Next, if so, proceed with the implementation of this function: @@ -1615,7 +1614,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateScreenSurfaceQNX(VkInstance inst struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_screen_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_QNX_screen_surface extension not enabled. vkCreateScreenSurfaceQNX not executed!\n"); + "VK_QNX_screen_surface extension not enabled. vkCreateScreenSurfaceQNX not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -1693,14 +1692,14 @@ VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceScreenPresentationSup struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_screen_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_QNX_screen_surface extension not enabled. vkGetPhysicalDeviceScreenPresentationSupportQNX not executed!\n"); + "VK_QNX_screen_surface extension not enabled. vkGetPhysicalDeviceScreenPresentationSupportQNX not executed!"); return VK_FALSE; } if (NULL == icd_term->dispatch.GetPhysicalDeviceScreenPresentationSupportQNX) { // return VK_FALSE as this driver doesn't support WSI functionality loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceScreenPresentationSupportQNX!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceScreenPresentationSupportQNX!"); return VK_FALSE; } @@ -1735,7 +1734,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateViSurfaceNN(VkInstance instance, struct loader_instance *loader_inst = loader_get_instance(instance); if (!loader_inst->wsi_vi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_NN_vi_surface extension not enabled. vkCreateViSurfaceNN not executed!\n"); + "VK_NN_vi_surface extension not enabled. vkCreateViSurfaceNN not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -1812,13 +1811,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceDisplayPropertiesKHR( struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkGetPhysicalDeviceDisplayPropertiesKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkGetPhysicalDeviceDisplayPropertiesKHR not executed!"); return VK_SUCCESS; } if (NULL == icd_term->dispatch.GetPhysicalDeviceDisplayPropertiesKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceDisplayPropertiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceDisplayPropertiesKHR!"); // return 0 for property count as this driver doesn't support WSI functionality if (pPropertyCount) { *pPropertyCount = 0; @@ -1853,13 +1852,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceDisplayPlanePropertie struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkGetPhysicalDeviceDisplayPlanePropertiesKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkGetPhysicalDeviceDisplayPlanePropertiesKHR not executed!"); return VK_SUCCESS; } if (NULL == icd_term->dispatch.GetPhysicalDeviceDisplayPlanePropertiesKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device does not export vkGetPhysicalDeviceDisplayPlanePropertiesKHR!\n"); + "ICD for selected physical device does not export vkGetPhysicalDeviceDisplayPlanePropertiesKHR!"); // return 0 for property count as this driver doesn't support WSI functionality if (pPropertyCount) { *pPropertyCount = 0; @@ -1894,13 +1893,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetDisplayPlaneSupportedDisplaysKHR(Vk struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkGetDisplayPlaneSupportedDisplaysKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkGetDisplayPlaneSupportedDisplaysKHR not executed!"); return VK_SUCCESS; } if (NULL == icd_term->dispatch.GetDisplayPlaneSupportedDisplaysKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device does not export vkGetDisplayPlaneSupportedDisplaysKHR!\n"); + "ICD for selected physical device does not export vkGetDisplayPlaneSupportedDisplaysKHR!"); // return 0 for property count as this driver doesn't support WSI functionality if (pDisplayCount) { *pDisplayCount = 0; @@ -1936,13 +1935,13 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetDisplayModePropertiesKHR(VkPhysical struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkGetDisplayModePropertiesKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkGetDisplayModePropertiesKHR not executed!"); return VK_SUCCESS; } if (NULL == icd_term->dispatch.GetDisplayModePropertiesKHR) { loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device does not export vkGetDisplayModePropertiesKHR!\n"); + "ICD for selected physical device does not export vkGetDisplayModePropertiesKHR!"); // return 0 for property count as this driver doesn't support WSI functionality if (pPropertyCount) { *pPropertyCount = 0; @@ -1979,14 +1978,14 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDisplayModeKHR(VkPhysicalDevice struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkCreateDisplayModeKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkCreateDisplayModeKHR not executed!"); return VK_ERROR_EXTENSION_NOT_PRESENT; } 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 does not export vkCreateDisplayModeKHR!\n"); + "ICD for selected physical device does not export vkCreateDisplayModeKHR!"); return VK_ERROR_INITIALIZATION_FAILED; } @@ -2018,14 +2017,14 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetDisplayPlaneCapabilitiesKHR(VkPhysi struct loader_instance *loader_inst = (struct loader_instance *)icd_term->this_instance; if (!loader_inst->wsi_display_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_display extension not enabled. vkGetDisplayPlaneCapabilitiesKHR not executed!\n"); + "VK_KHR_display extension not enabled. vkGetDisplayPlaneCapabilitiesKHR not executed!"); return VK_SUCCESS; } if (NULL == icd_term->dispatch.GetDisplayPlaneCapabilitiesKHR) { // Emulate support loader_log(loader_inst, VULKAN_LOADER_WARN_BIT, 0, - "ICD for selected physical device does not export vkGetDisplayPlaneCapabilitiesKHR!\n"); + "ICD for selected physical device does not export vkGetDisplayPlaneCapabilitiesKHR!"); if (pCapabilities) { memset(pCapabilities, 0, sizeof(VkDisplayPlaneCapabilitiesKHR)); } @@ -2060,7 +2059,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDisplayPlaneSurfaceKHR(VkInstanc if (!inst->wsi_display_enabled) { loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkCreateDisplayPlaneSurfaceKHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkCreateDisplayPlaneSurfaceKHR not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -2515,7 +2514,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateImagePipeSurfaceFUCHSIA(VkInstan if (!loader_inst->wsi_imagepipe_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, "VK_FUCHSIA_imagepipe_surface extension not enabled. " - "vkCreateImagePipeSurfaceFUCHSIA not executed!\n"); + "vkCreateImagePipeSurfaceFUCHSIA not executed!"); vkRes = VK_ERROR_EXTENSION_NOT_PRESENT; goto out; } @@ -2589,7 +2588,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceCapabilities2K if (!loader_inst->wsi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceCapabilities2KHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceCapabilities2KHR not executed!"); return VK_SUCCESS; } @@ -2681,7 +2680,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormats2KHR(Vk if (!loader_inst->wsi_surface_enabled) { loader_log(loader_inst, VULKAN_LOADER_ERROR_BIT, 0, - "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceFormats2KHR not executed!\n"); + "VK_KHR_surface extension not enabled. vkGetPhysicalDeviceSurfaceFormats2KHR not executed!"); return VK_SUCCESS; } |