Commit 0a0e4fd2 authored by Peng Huang's avatar Peng Huang Committed by Commit Bot

Vulkan: remove device level layers.

The device level layers are depercated, and there is no device level
layers for now, so remove it.
https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#extendingvulkan-layers-devicelayerdeprecation

Bug: None
Change-Id: I9507191ca515876a8d97140261bd4099f284dfe6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2075965Reviewed-by: default avatarVasiliy Telezhnikov <vasilyt@chromium.org>
Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744857}
parent 8d889479
......@@ -27,7 +27,6 @@ class GPU_EXPORT VulkanPhysicalDeviceInfo {
VkPhysicalDeviceProperties properties = {};
std::vector<VkExtensionProperties> extensions;
std::vector<VkLayerProperties> layers;
VkPhysicalDeviceFeatures features = {};
// Extended physical device features:
......
......@@ -10,7 +10,6 @@ import "gpu/ipc/common/vulkan_types.mojom";
struct VulkanPhysicalDeviceInfo {
VkPhysicalDeviceProperties properties;
array<VkExtensionProperties> extensions;
array<VkLayerProperties> layers;
VkPhysicalDeviceFeatures features;
bool feature_sampler_ycbcr_conversion;
bool feature_protected_memory;
......
......@@ -26,11 +26,6 @@ struct StructTraits<gpu::mojom::VulkanPhysicalDeviceInfoDataView,
return input.extensions;
}
static const std::vector<VkLayerProperties>& layers(
const gpu::VulkanPhysicalDeviceInfo& input) {
return input.layers;
}
static const VkPhysicalDeviceFeatures& features(
const gpu::VulkanPhysicalDeviceInfo& input) {
return input.features;
......@@ -57,8 +52,6 @@ struct StructTraits<gpu::mojom::VulkanPhysicalDeviceInfoDataView,
return false;
if (!data.ReadExtensions(&out->extensions))
return false;
if (!data.ReadLayers(&out->layers))
return false;
if (!data.ReadFeatures(&out->features))
return false;
out->feature_sampler_ycbcr_conversion =
......
......@@ -89,18 +89,6 @@ bool VulkanDeviceQueue::Initialize(
queue_create_info.flags =
allow_protected_memory ? VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT : 0;
std::vector<const char*> enabled_layer_names;
#if DCHECK_IS_ON()
std::unordered_set<std::string> desired_layers({
"VK_LAYER_KHRONOS_validation",
});
for (const auto& layer : physical_device_info.layers) {
if (desired_layers.find(layer.layerName) != desired_layers.end())
enabled_layer_names.push_back(layer.layerName);
}
#endif // DCHECK_IS_ON()
std::vector<const char*> enabled_extensions;
enabled_extensions.insert(std::end(enabled_extensions),
std::begin(required_extensions),
......@@ -148,8 +136,6 @@ bool VulkanDeviceQueue::Initialize(
device_create_info.pNext = enabled_device_features_2_.pNext;
device_create_info.queueCreateInfoCount = 1;
device_create_info.pQueueCreateInfos = &queue_create_info;
device_create_info.enabledLayerCount = enabled_layer_names.size();
device_create_info.ppEnabledLayerNames = enabled_layer_names.data();
device_create_info.enabledExtensionCount = enabled_extensions.size();
device_create_info.ppEnabledExtensionNames = enabled_extensions.data();
device_create_info.pEnabledFeatures = &enabled_device_features_2_.features;
......
......@@ -276,17 +276,6 @@ void VulkanInstance::CollectInfo() {
DLOG_IF(ERROR, result != VK_SUCCESS)
<< "vkEnumerateDeviceExtensionProperties failed: " << result;
count = 0;
result = vkEnumerateDeviceLayerProperties(device, &count, nullptr);
DLOG_IF(ERROR, result != VK_SUCCESS)
<< "vkEnumerateDeviceLayerProperties failed: " << result;
info.layers.resize(count);
result =
vkEnumerateDeviceLayerProperties(device, &count, info.layers.data());
DLOG_IF(ERROR, result != VK_SUCCESS)
<< "vkEnumerateDeviceLayerProperties failed: " << result;
// The API version of the VkInstance might be different than the supported
// API version of the VkPhysicalDevice, so we need to check the GPU's
// API version instead of just testing to see if
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment