diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-06 16:51:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-06 16:51:57 +0100 |
commit | f57bdf13af3e99b0f0235909eecc428d913c9b01 (patch) | |
tree | c3de2d4e926715519ecf3f1980b24ae6b8ecb0fe /drivers | |
parent | 6ebbdb4a80a4ae6ac83485dc01622d9795c4e451 (diff) | |
parent | c0d3bdc0cac39f9a7a1ba5327b694f7b4350faeb (diff) |
Merge pull request #50493 from timothyqiu/local-vector-list-init
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/vulkan/vulkan_context.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/vulkan/vulkan_context.cpp b/drivers/vulkan/vulkan_context.cpp index 102787f0bf..75a3ab26ea 100644 --- a/drivers/vulkan/vulkan_context.cpp +++ b/drivers/vulkan/vulkan_context.cpp @@ -33,6 +33,7 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/string/ustring.h" +#include "core/templates/local_vector.h" #include "core/version.h" #include "servers/rendering/rendering_device.h" @@ -41,7 +42,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <vector> #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define APP_SHORT_NAME "GodotEngine" @@ -212,7 +212,7 @@ VkBool32 VulkanContext::_check_layers(uint32_t check_count, const char *const *c } Error VulkanContext::_get_preferred_validation_layers(uint32_t *count, const char *const **names) { - static const std::vector<std::vector<const char *>> instance_validation_layers_alt{ + static const LocalVector<LocalVector<const char *>> instance_validation_layers_alt{ // Preferred set of validation layers { "VK_LAYER_KHRONOS_validation" }, @@ -249,10 +249,10 @@ Error VulkanContext::_get_preferred_validation_layers(uint32_t *count, const cha } for (uint32_t i = 0; i < instance_validation_layers_alt.size(); i++) { - if (_check_layers(instance_validation_layers_alt[i].size(), instance_validation_layers_alt[i].data(), instance_layer_count, instance_layers)) { + if (_check_layers(instance_validation_layers_alt[i].size(), instance_validation_layers_alt[i].ptr(), instance_layer_count, instance_layers)) { *count = instance_validation_layers_alt[i].size(); if (names != nullptr) { - *names = instance_validation_layers_alt[i].data(); + *names = instance_validation_layers_alt[i].ptr(); } break; } |