diff options
| author | Charles Giessen <charles@lunarg.com> | 2022-10-19 14:41:50 -0600 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2022-10-24 11:45:21 -0600 |
| commit | 9bb5a7ccd009446972c88f4af153c59e0f2eac83 (patch) | |
| tree | e9c91ba7729156e3b04e301cd409a6c9f1db8b26 | |
| parent | 616c407893a935101d2e3ba0812dcacc2b3e303f (diff) | |
| download | vulkan-tools-9bb5a7ccd009446972c88f4af153c59e0f2eac83.tar.gz | |
vulkaninfo: Fix validation errors
Required checking for surface support of a given physical device as well as
adding the correct Image usage for transient images.
| -rw-r--r-- | vulkaninfo/vulkaninfo.cpp | 6 | ||||
| -rw-r--r-- | vulkaninfo/vulkaninfo.h | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp index 8574b176..af723207 100644 --- a/vulkaninfo/vulkaninfo.cpp +++ b/vulkaninfo/vulkaninfo.cpp @@ -1103,6 +1103,12 @@ int main(int argc, char **argv) { surface_extension.surface = surface_extension.create_surface(instance); for (auto &phys_device : phys_devices) { try { + // check if the surface is supported by the physical device before adding it to the list + VkBool32 supported = VK_FALSE; + VkResult err = instance.ext_funcs.vkGetPhysicalDeviceSurfaceSupportKHR(phys_device, 0, + surface_extension.surface, &supported); + if (err != VK_SUCCESS || supported == VK_FALSE) continue; + surfaces.push_back(std::unique_ptr<AppSurface>(new AppSurface(instance, phys_device, surface_extension))); } catch (std::exception &e) { std::cerr << "ERROR while creating surface for extension " << surface_extension.name << " : " << e.what() diff --git a/vulkaninfo/vulkaninfo.h b/vulkaninfo/vulkaninfo.h index 1e8be531..04775b77 100644 --- a/vulkaninfo/vulkaninfo.h +++ b/vulkaninfo/vulkaninfo.h @@ -1251,12 +1251,10 @@ class AppSurface { std::unique_ptr<surface_capabilities2_chain> chain_for_surface_capabilities2; AppSurface(AppInstance &inst, VkPhysicalDevice phys_device, SurfaceExtension surface_extension) - : inst(inst), - phys_device(phys_device), - surface_extension(surface_extension), - surf_present_modes(GetVector<VkPresentModeKHR>("vkGetPhysicalDeviceSurfacePresentModesKHR", + : inst(inst), phys_device(phys_device), surface_extension(surface_extension) { + surf_present_modes = GetVector<VkPresentModeKHR>("vkGetPhysicalDeviceSurfacePresentModesKHR", inst.ext_funcs.vkGetPhysicalDeviceSurfacePresentModesKHR, phys_device, - surface_extension.surface)) { + surface_extension.surface); const VkPhysicalDeviceSurfaceInfo2KHR surface_info2 = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR, nullptr, surface_extension.surface}; @@ -1633,6 +1631,7 @@ struct AppGpu { if (tiling == VK_IMAGE_TILING_LINEAR) { if (format == color_format) { image_ci_regular.usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + image_ci_transient.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; } else { // linear tiling is only applicable to color image types continue; |