diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/gpu/vulkan/vulkan_device_queue.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/gpu/vulkan/vulkan_device_queue.cc')
| -rw-r--r-- | chromium/gpu/vulkan/vulkan_device_queue.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/gpu/vulkan/vulkan_device_queue.cc b/chromium/gpu/vulkan/vulkan_device_queue.cc index 77127965721..6ca7cefc203 100644 --- a/chromium/gpu/vulkan/vulkan_device_queue.cc +++ b/chromium/gpu/vulkan/vulkan_device_queue.cc @@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "gpu/config/gpu_info.h" // nogncheck #include "gpu/config/vulkan_info.h" @@ -75,6 +76,9 @@ bool VulkanDeviceQueue::Initialize( for (size_t i = 0; i < info.physical_devices.size(); ++i) { const auto& device_info = info.physical_devices[i]; const auto& device_properties = device_info.properties; + if (device_properties.apiVersion < info.used_api_version) + continue; + const VkPhysicalDevice& device = device_info.device; for (size_t n = 0; n < device_info.queue_families.size(); ++n) { if ((device_info.queue_families[n].queueFlags & queue_flags) != @@ -172,12 +176,6 @@ bool VulkanDeviceQueue::Initialize( } } - if (vk_physical_device_properties_.apiVersion < info.used_api_version) { - LOG(ERROR) << "Physical device doesn't support version." - << info.used_api_version; - return false; - } - crash_keys::vulkan_device_api_version.Set( VkVersionToString(vk_physical_device_properties_.apiVersion)); crash_keys::vulkan_device_driver_version.Set(base::StringPrintf( |