[Bf-blender-cvs] [5a90bbf7167] master: Cleanup: format

Campbell Barton noreply at git.blender.org
Wed Nov 2 01:20:39 CET 2022


Commit: 5a90bbf71675651bd74cef435c0724e5b07a544c
Author: Campbell Barton
Date:   Wed Nov 2 10:18:40 2022 +1100
Branches: master
https://developer.blender.org/rB5a90bbf71675651bd74cef435c0724e5b07a544c

Cleanup: format

===================================================================

M	release/scripts/startup/bl_ui/node_add_menu.py
M	source/blender/gpu/vulkan/vk_framebuffer.cc
M	source/blender/gpu/vulkan/vk_query.hh
M	source/blender/gpu/vulkan/vk_shader.hh

===================================================================

diff --git a/release/scripts/startup/bl_ui/node_add_menu.py b/release/scripts/startup/bl_ui/node_add_menu.py
index d393dc04963..873dbd533a5 100644
--- a/release/scripts/startup/bl_ui/node_add_menu.py
+++ b/release/scripts/startup/bl_ui/node_add_menu.py
@@ -58,9 +58,11 @@ def draw_node_group_add_menu(context, layout):
                 ops.name = "node_tree"
                 ops.value = "bpy.data.node_groups[%r]" % group.name
 
+
 def draw_assets_for_catalog(layout, catalog_path):
     layout.template_node_asset_menu_items(catalog_path=catalog_path)
 
+
 def draw_root_assets(layout):
     layout.menu_contents("NODE_MT_node_add_root_catalogs")
 
diff --git a/source/blender/gpu/vulkan/vk_framebuffer.cc b/source/blender/gpu/vulkan/vk_framebuffer.cc
index 01a5f7c0f81..48b0685bf38 100644
--- a/source/blender/gpu/vulkan/vk_framebuffer.cc
+++ b/source/blender/gpu/vulkan/vk_framebuffer.cc
@@ -25,7 +25,7 @@ void VKFrameBuffer::clear(eGPUFrameBufferBits /*buffers*/,
 {
 }
 
-void VKFrameBuffer::clear_multi(const float (* /*clear_col*/)[4])
+void VKFrameBuffer::clear_multi(const float (*/*clear_col*/)[4])
 {
 }
 
diff --git a/source/blender/gpu/vulkan/vk_query.hh b/source/blender/gpu/vulkan/vk_query.hh
index 7f8f81e2b95..36558ef9549 100644
--- a/source/blender/gpu/vulkan/vk_query.hh
+++ b/source/blender/gpu/vulkan/vk_query.hh
@@ -15,8 +15,8 @@ class VKQueryPool : public QueryPool {
  public:
   void init(GPUQueryType type) override;
   void begin_query() override;
-   void end_query() override;
-   void get_occlusion_result(MutableSpan<uint32_t> r_values) override;
+  void end_query() override;
+  void get_occlusion_result(MutableSpan<uint32_t> r_values) override;
 };
 
 }  // namespace blender::gpu
\ No newline at end of file
diff --git a/source/blender/gpu/vulkan/vk_shader.hh b/source/blender/gpu/vulkan/vk_shader.hh
index 1c09ef407ad..9ab0aca67eb 100644
--- a/source/blender/gpu/vulkan/vk_shader.hh
+++ b/source/blender/gpu/vulkan/vk_shader.hh
@@ -17,21 +17,22 @@ class VKShader : public Shader {
   {
   }
 
-  void vertex_shader_from_glsl(MutableSpan<const char *> sources)override;
-  void geometry_shader_from_glsl(MutableSpan<const char *> sources)override;
-  void fragment_shader_from_glsl(MutableSpan<const char *> sources)override;
-  void compute_shader_from_glsl(MutableSpan<const char *> sources)override;
-  bool finalize(const shader::ShaderCreateInfo *info = nullptr)override;
-
-  void transform_feedback_names_set(Span<const char *> name_list, eGPUShaderTFBType geom_type)override;
-  bool transform_feedback_enable(GPUVertBuf *)override;
-  void transform_feedback_disable()override;
-
-  void bind()override;
-  void unbind()override;
-
-  void uniform_float(int location, int comp_len, int array_size, const float *data)override;
-  void uniform_int(int location, int comp_len, int array_size, const int *data)override;
+  void vertex_shader_from_glsl(MutableSpan<const char *> sources) override;
+  void geometry_shader_from_glsl(MutableSpan<const char *> sources) override;
+  void fragment_shader_from_glsl(MutableSpan<const char *> sources) override;
+  void compute_shader_from_glsl(MutableSpan<const char *> sources) override;
+  bool finalize(const shader::ShaderCreateInfo *info = nullptr) override;
+
+  void transform_feedback_names_set(Span<const char *> name_list,
+                                    eGPUShaderTFBType geom_type) override;
+  bool transform_feedback_enable(GPUVertBuf *) override;
+  void transform_feedback_disable() override;
+
+  void bind() override;
+  void unbind() override;
+
+  void uniform_float(int location, int comp_len, int array_size, const float *data) override;
+  void uniform_int(int location, int comp_len, int array_size, const int *data) override;
 
   std::string resources_declare(const shader::ShaderCreateInfo &info) const override;
   std::string vertex_interface_declare(const shader::ShaderCreateInfo &info) const override;



More information about the Bf-blender-cvs mailing list