diff options
| author | 2016-04-22 03:41:45 +0000 | |
|---|---|---|
| committer | 2016-04-22 03:41:45 +0000 | |
| commit | 2ee735c97c760cec76c1385f1896b822ff45cba5 (patch) | |
| tree | 3358b76a4fa3e54b225798fe28a056f8d15fd560 /vulkan/tools/vkinfo.cpp | |
| parent | 9461b93f7e46e71dd43b021084012ec337a5cee3 (diff) | |
| parent | 109f8985ceaf746fd04b6fe81be238b3865062b7 (diff) | |
Merge changes Ifeba21da,Ie7982790,I02bb34b7 into nyc-dev
* changes:
vulkan: silence a warning when layers are enabled
vulkan: fix "vkinfo -validate"
vulkan: fix vkinfo with layer extensions
Diffstat (limited to 'vulkan/tools/vkinfo.cpp')
| -rw-r--r-- | vulkan/tools/vkinfo.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/vulkan/tools/vkinfo.cpp b/vulkan/tools/vkinfo.cpp index e97e5f56c4..62d8240f92 100644 --- a/vulkan/tools/vkinfo.cpp +++ b/vulkan/tools/vkinfo.cpp @@ -162,8 +162,11 @@ void GatherGpuInfo(VkPhysicalDevice gpu, uint32_t num_extensions = 0; for (const auto& desired_ext : kDesiredExtensions) { bool available = HasExtension(info.extensions, desired_ext); - for (size_t i = 0; !available && i < info.layer_extensions.size(); i++) - available = HasExtension(info.layer_extensions[i], desired_ext); + if (options.validate) { + for (size_t i = 0; !available && i < info.layer_extensions.size(); + i++) + available = HasExtension(info.layer_extensions[i], desired_ext); + } if (available) extensions[num_extensions++] = desired_ext; } @@ -179,12 +182,11 @@ void GatherGpuInfo(VkPhysicalDevice gpu, // clang-format off const char *kValidationLayers[] = { "VK_LAYER_GOOGLE_threading", + "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_LUNARG_device_limits", - "VK_LAYER_LUNARG_draw_state", - "VK_LAYER_LUNARG_image", - "VK_LAYER_LUNARG_mem_tracker", "VK_LAYER_LUNARG_object_tracker", - "VK_LAYER_LUNARG_param_checker", + "VK_LAYER_LUNARG_image", + "VK_LAYER_LUNARG_core_validation", "VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects" }; @@ -236,8 +238,12 @@ void GatherInfo(VulkanInfo* info, const Options& options) { uint32_t num_extensions = 0; for (const auto& desired_ext : kDesiredExtensions) { bool available = HasExtension(info->extensions, desired_ext); - for (size_t i = 0; !available && i < info->layer_extensions.size(); i++) - available = HasExtension(info->layer_extensions[i], desired_ext); + if (options.validate) { + for (size_t i = 0; !available && i < info->layer_extensions.size(); + i++) + available = + HasExtension(info->layer_extensions[i], desired_ext); + } if (available) extensions[num_extensions++] = desired_ext; } @@ -245,12 +251,11 @@ void GatherInfo(VulkanInfo* info, const Options& options) { // clang-format off const char *kValidationLayers[] = { "VK_LAYER_GOOGLE_threading", + "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_LUNARG_device_limits", - "VK_LAYER_LUNARG_draw_state", - "VK_LAYER_LUNARG_image", - "VK_LAYER_LUNARG_mem_tracker", "VK_LAYER_LUNARG_object_tracker", - "VK_LAYER_LUNARG_param_checker", + "VK_LAYER_LUNARG_image", + "VK_LAYER_LUNARG_core_validation", "VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects" }; |