vulkan: refactor layer enumeration
Replace Enumerate*Layers by a set of new functions that do not distinguish
instance and device layers. The new functions are also careful not to
pollute the rest of the loader with std containers.
There should be no user-visible change.
Bug: 27911856
Change-Id: I4790fadc1aa2ea934a4628bce55dd45892f15e0b
diff --git a/vulkan/libvulkan/layers_extensions.cpp b/vulkan/libvulkan/layers_extensions.cpp
index 4cf1c2a..4363dd8 100644
--- a/vulkan/libvulkan/layers_extensions.cpp
+++ b/vulkan/libvulkan/layers_extensions.cpp
@@ -50,6 +50,7 @@
VkLayerProperties properties;
size_t library_idx;
+ // true if the layer intercepts vkCreateDevice and device commands
bool is_global;
std::vector<VkExtensionProperties> instance_extensions;
@@ -359,29 +360,20 @@
DiscoverLayersInDirectory(LoaderData::GetInstance().layer_path.c_str());
}
-uint32_t EnumerateInstanceLayers(uint32_t count,
- VkLayerProperties* properties) {
- uint32_t n =
- std::min(count, static_cast<uint32_t>(g_instance_layers.size()));
- for (uint32_t i = 0; i < n; i++)
- properties[i] = g_instance_layers[i].properties;
-
+uint32_t GetLayerCount() {
return static_cast<uint32_t>(g_instance_layers.size());
}
-uint32_t EnumerateDeviceLayers(uint32_t count, VkLayerProperties* properties) {
- uint32_t n = 0;
- for (const auto& layer : g_instance_layers) {
- // ignore non-global layers
- if (!layer.is_global)
- continue;
+const Layer& GetLayer(uint32_t index) {
+ return g_instance_layers[index];
+}
- if (n < count)
- properties[n] = layer.properties;
- n++;
- }
+const VkLayerProperties& GetLayerProperties(const Layer& layer) {
+ return layer.properties;
+}
- return n;
+bool IsLayerGlobal(const Layer& layer) {
+ return layer.is_global;
}
void GetInstanceLayerExtensions(const char* name,