diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-21 18:47:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 18:47:34 +0200 |
| commit | cb1ae08c14e02ce29fb71ae40ae657f1d30a0422 (patch) | |
| tree | 4b68359acf5f698c2ad643f3f318124013e41f5a /drivers/vulkan/rendering_device_vulkan.cpp | |
| parent | 4f03e302a7aacd73760d592410502396588a0c1d (diff) | |
| parent | f8ef38efed3c4f814b2762b2e054e0bbf7d911b4 (diff) | |
Merge pull request #38083 from reduz/use-typed-arrays
Add proper type to most public API uses of Array
Diffstat (limited to 'drivers/vulkan/rendering_device_vulkan.cpp')
| -rw-r--r-- | drivers/vulkan/rendering_device_vulkan.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index c01c325b67..23e9227a39 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -3327,7 +3327,7 @@ RID RenderingDeviceVulkan::vertex_buffer_create(uint32_t p_size_bytes, const Vec } // Internally reference counted, this ID is warranted to be unique for the same description, but needs to be freed as many times as it was allocated -RenderingDevice::VertexFormatID RenderingDeviceVulkan::vertex_format_create(const Vector<VertexDescription> &p_vertex_formats) { +RenderingDevice::VertexFormatID RenderingDeviceVulkan::vertex_format_create(const Vector<VertexAttribute> &p_vertex_formats) { _THREAD_SAFE_METHOD_ @@ -3402,7 +3402,7 @@ RID RenderingDeviceVulkan::vertex_array_create(uint32_t p_vertex_count, VertexFo //validate with buffer { - const VertexDescription &atf = vd.vertex_formats[i]; + const VertexAttribute &atf = vd.vertex_formats[i]; uint32_t element_size = get_format_vertex_size(atf.format); ERR_FAIL_COND_V(element_size == 0, RID()); //should never happens since this was prevalidated |