From cb282c6ef0bb91957f8a6f422705813bd47c788c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 17 Mar 2020 07:33:00 +0100 Subject: Style: Set clang-format Standard to Cpp11 For us, it practically only changes the fact that `A>` is now used instead of the C++03 compatible `A >`. Note: clang-format 10+ changed the `Standard` arguments to fully specified `c++11`, `c++14`, etc. versions, but we can't use `c++17` now if we want to preserve compatibility with clang-format 8 and 9. `Cpp11` is still supported as deprecated alias for `Latest`. --- drivers/vulkan/rendering_device_vulkan.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/vulkan/rendering_device_vulkan.cpp') diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 361982b28d..76541c3cd5 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -57,7 +57,7 @@ void RenderingDeviceVulkan::_free_dependencies(RID p_id) { //direct dependencies must be freed - Map >::Element *E = dependency_map.find(p_id); + Map>::Element *E = dependency_map.find(p_id); if (E) { while (E->get().size()) { @@ -72,7 +72,7 @@ void RenderingDeviceVulkan::_free_dependencies(RID p_id) { if (E) { for (Set::Element *F = E->get().front(); F; F = F->next()) { - Map >::Element *G = dependency_map.find(F->get()); + Map>::Element *G = dependency_map.find(F->get()); ERR_CONTINUE(!G); ERR_CONTINUE(!G->get().has(p_id)); G->get().erase(p_id); @@ -1555,7 +1555,7 @@ void RenderingDeviceVulkan::_buffer_memory_barrier(VkBuffer buffer, uint64_t p_f /**** TEXTURE ****/ /*****************/ -RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const TextureView &p_view, const Vector > &p_data) { +RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const TextureView &p_view, const Vector> &p_data) { _THREAD_SAFE_METHOD_ @@ -3568,8 +3568,8 @@ bool RenderingDeviceVulkan::_uniform_add_binding(Vector &p_stages) { //descriptor layouts - Vector > set_bindings; - Vector > uniform_info; + Vector> set_bindings; + Vector> uniform_info; Shader::PushConstant push_constant; push_constant.push_constant_size = 0; push_constant.push_constants_vk_stage = 0; @@ -4223,9 +4223,9 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector &p_uniforms, DescriptorPoolKey pool_key; //to keep them alive until update call - List > buffer_infos; - List > buffer_views; - List > image_infos; + List> buffer_infos; + List> buffer_views; + List> image_infos; //used for verification to make sure a uniform set does not use a framebuffer bound texture Vector attachable_textures; Vector mutable_sampled_textures; -- cgit v1.2.3