gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-07-20 17:55:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add list initialization support for Vector & LocalVector

Browse source
This commit is contained in:
Haoyu Qiu 2021-07-16 00:28:05 +08:00
parent d2ac67d55e
commit c0d3bdc0ca
5 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/templates/local_vector.h
View file

@ -36,6 +36,8 @@
#include "core/templates/sort_array.h"
#include "core/templates/vector.h"
#include <initializer_list>
template <class T, class U = uint32_t, bool force_trivial = false>
class LocalVector {
private:
@ -228,6 +230,12 @@ public:
}
_FORCE_INLINE_ LocalVector() {}
_FORCE_INLINE_ LocalVector(std::initializer_list<T> p_init) {
reserve(p_init.size());
for (const T &element : p_init) {
push_back(element);
}
}
_FORCE_INLINE_ LocalVector(const LocalVector &p_from) {
resize(p_from.size());
for (U i = 0; i < p_from.count; i++) {

11
core/templates/vector.h
View file

@ -43,6 +43,8 @@
#include "core/templates/search_array.h"
#include "core/templates/sort_array.h"
#include <initializer_list>
template <class T>
class VectorWriteProxy {
public:
@ -258,6 +260,15 @@ public:
}
_FORCE_INLINE_ Vector() {}
_FORCE_INLINE_ Vector(std::initializer_list<T> p_init) {
Error err = _cowdata.resize(p_init.size());
ERR_FAIL_COND(err);
int i = 0;
for (const T &element : p_init) {
_cowdata.set(i++, element);
}
}
_FORCE_INLINE_ Vector(const Vector &p_from) { _cowdata._ref(p_from._cowdata); }
_FORCE_INLINE_ ~Vector() {}

8
drivers/vulkan/vulkan_context.cpp
View file

@ -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;
}

11
tests/core/templates/test_local_vector.h
View file

@ -37,6 +37,17 @@
namespace TestLocalVector {
TEST_CASE("[LocalVector] List Initialization.") {
LocalVector<int> vector{ 0, 1, 2, 3, 4 };
CHECK(vector.size() == 5);
CHECK(vector[0] == 0);
CHECK(vector[1] == 1);
CHECK(vector[2] == 2);
CHECK(vector[3] == 3);
CHECK(vector[4] == 4);
}
TEST_CASE("[LocalVector] Push Back.") {
LocalVector<int> vector;
vector.push_back(0);

11
tests/core/templates/test_vector.h
View file

@ -37,6 +37,17 @@
namespace TestVector {
TEST_CASE("[Vector] List initialization") {
Vector<int> vector{ 0, 1, 2, 3, 4 };
CHECK(vector.size() == 5);
CHECK(vector[0] == 0);
CHECK(vector[1] == 1);
CHECK(vector[2] == 2);
CHECK(vector[3] == 3);
CHECK(vector[4] == 4);
}
TEST_CASE("[Vector] Push back and append") {
Vector<int> vector;
vector.push_back(0);