blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 765 Projects 19 Wiki Activity

Cleanup: format

This commit is contained in:
Campbell Barton 2022-11-02 10:18:40 +11:00
parent 889b3385b5
commit 5a90bbf716
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/node_add_menu.py
View File

@ -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")

2
source/blender/gpu/vulkan/vk_framebuffer.cc
View File

@ -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])
{
}

4
source/blender/gpu/vulkan/vk_query.hh
View File

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

25
source/blender/gpu/vulkan/vk_shader.hh
View File

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