From a331d5c99299c4514ca33c843b1c79b872f2728d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 6 Nov 2020 13:18:48 +0100 Subject: Cleanup: Clang-Tidy, modernize-redundant-void-arg --- source/blender/gpu/intern/gpu_context.cc | 6 +++--- source/blender/gpu/intern/gpu_framebuffer.cc | 2 +- source/blender/gpu/intern/gpu_immediate.cc | 16 ++++++++-------- source/blender/gpu/intern/gpu_platform.cc | 6 +++--- source/blender/gpu/intern/gpu_shader_interface.cc | 8 ++++---- source/blender/gpu/intern/gpu_state.cc | 20 ++++++++++---------- source/blender/gpu/intern/gpu_vertex_buffer.cc | 10 +++++----- 7 files changed, 34 insertions(+), 34 deletions(-) (limited to 'source/blender/gpu/intern') diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc index 119c1ef9c55..3ebfd80241d 100644 --- a/source/blender/gpu/intern/gpu_context.cc +++ b/source/blender/gpu/intern/gpu_context.cc @@ -80,12 +80,12 @@ Context::~Context() delete imm; } -bool Context::is_active_on_thread(void) +bool Context::is_active_on_thread() { return (this == active_ctx) && pthread_equal(pthread_self(), thread_); } -Context *Context::get(void) +Context *Context::get() { return active_ctx; } @@ -188,7 +188,7 @@ void GPU_backend_exit(void) g_backend = NULL; } -GPUBackend *GPUBackend::get(void) +GPUBackend *GPUBackend::get() { return g_backend; } diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc index 8d9a1301be0..a16856e0dec 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.cc +++ b/source/blender/gpu/intern/gpu_framebuffer.cc @@ -496,7 +496,7 @@ static void gpuPushFrameBuffer(GPUFrameBuffer *fb) FrameBufferStack.top++; } -static GPUFrameBuffer *gpuPopFrameBuffer(void) +static GPUFrameBuffer *gpuPopFrameBuffer() { BLI_assert(FrameBufferStack.top > 0); FrameBufferStack.top--; diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index 44c6cac02ca..9437f18cb14 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -41,17 +41,17 @@ using namespace blender::gpu; static thread_local Immediate *imm = NULL; -void immActivate(void) +void immActivate() { imm = Context::get()->imm; } -void immDeactivate(void) +void immDeactivate() { imm = NULL; } -GPUVertFormat *immVertexFormat(void) +GPUVertFormat *immVertexFormat() { GPU_vertformat_clear(&imm->vertex_format); return &imm->vertex_format; @@ -81,7 +81,7 @@ void immBindBuiltinProgram(eGPUBuiltinShader shader_id) imm->builtin_shader_bound = shader_id; } -void immUnbindProgram(void) +void immUnbindProgram() { BLI_assert(imm->shader != NULL); @@ -90,7 +90,7 @@ void immUnbindProgram(void) } /* XXX do not use it. Special hack to use OCIO with batch API. */ -GPUShader *immGetShader(void) +GPUShader *immGetShader() { return imm->shader; } @@ -187,7 +187,7 @@ static void wide_line_workaround_start(GPUPrimType prim_type) } } -static void wide_line_workaround_end(void) +static void wide_line_workaround_end() { if (imm->prev_shader) { immUnbindProgram(); @@ -249,7 +249,7 @@ GPUBatch *immBeginBatchAtMost(GPUPrimType prim_type, uint vertex_len) return immBeginBatch(prim_type, vertex_len); } -void immEnd(void) +void immEnd() { BLI_assert(imm->prim_type != GPU_PRIM_NONE); /* Make sure we're between a Begin/End pair. */ BLI_assert(imm->vertex_data || imm->batch); @@ -480,7 +480,7 @@ void immAttrSkip(uint attr_id) setAttrValueBit(attr_id); } -static void immEndVertex(void) /* and move on to the next vertex */ +static void immEndVertex() /* and move on to the next vertex */ { BLI_assert(imm->prim_type != GPU_PRIM_NONE); /* make sure we're between a Begin/End pair */ BLI_assert(imm->vertex_idx < imm->vertex_len); diff --git a/source/blender/gpu/intern/gpu_platform.cc b/source/blender/gpu/intern/gpu_platform.cc index ad7142878e7..6b9878f2ba4 100644 --- a/source/blender/gpu/intern/gpu_platform.cc +++ b/source/blender/gpu/intern/gpu_platform.cc @@ -77,7 +77,7 @@ void GPUPlatformGlobal::create_gpu_name(const char *vendor, BLI_str_replace_char(gpu_name, '\r', ' '); } -void GPUPlatformGlobal::clear(void) +void GPUPlatformGlobal::clear() { MEM_SAFE_FREE(GPG.support_key); MEM_SAFE_FREE(GPG.gpu_name); @@ -94,12 +94,12 @@ void GPUPlatformGlobal::clear(void) using namespace blender::gpu; -eGPUSupportLevel GPU_platform_support_level(void) +eGPUSupportLevel GPU_platform_support_level() { return GPG.support_level; } -const char *GPU_platform_support_level_key(void) +const char *GPU_platform_support_level_key() { return GPG.support_key; } diff --git a/source/blender/gpu/intern/gpu_shader_interface.cc b/source/blender/gpu/intern/gpu_shader_interface.cc index e5fb8025e7f..81c1e013877 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.cc +++ b/source/blender/gpu/intern/gpu_shader_interface.cc @@ -32,12 +32,12 @@ namespace blender::gpu { -ShaderInterface::ShaderInterface(void) +ShaderInterface::ShaderInterface() { /* TODO(fclem): add unique ID for debugging. */ } -ShaderInterface::~ShaderInterface(void) +ShaderInterface::~ShaderInterface() { /* Free memory used by name_buffer. */ MEM_freeN(name_buffer_); @@ -70,14 +70,14 @@ static void sort_input_list(MutableSpan dst) /* Sorts all inputs inside their respective array. * This is to allow fast hash collision detection. * See ShaderInterface::input_lookup for more details. */ -void ShaderInterface::sort_inputs(void) +void ShaderInterface::sort_inputs() { sort_input_list(MutableSpan(inputs_, attr_len_)); sort_input_list(MutableSpan(inputs_ + attr_len_, ubo_len_)); sort_input_list(MutableSpan(inputs_ + attr_len_ + ubo_len_, uniform_len_)); } -void ShaderInterface::debug_print(void) +void ShaderInterface::debug_print() { Span attrs = Span(inputs_, attr_len_); Span ubos = Span(inputs_ + attr_len_, ubo_len_); diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc index 0b2e4989a33..407a8dd6e2b 100644 --- a/source/blender/gpu/intern/gpu_state.cc +++ b/source/blender/gpu/intern/gpu_state.cc @@ -260,7 +260,7 @@ eGPUStencilTest GPU_stencil_test_get() } /* NOTE: Already premultiplied by U.pixelsize. */ -float GPU_line_width_get(void) +float GPU_line_width_get() { GPUStateMutable &state = Context::get()->state_manager->mutable_state; return state.line_width; @@ -285,13 +285,13 @@ void GPU_viewport_size_get_i(int coords[4]) Context::get()->active_fb->viewport_get(coords); } -bool GPU_depth_mask_get(void) +bool GPU_depth_mask_get() { GPUState &state = Context::get()->state_manager->state; return (state.write_mask & GPU_WRITE_DEPTH) != 0; } -bool GPU_mipmap_enabled(void) +bool GPU_mipmap_enabled() { /* TODO(fclem): this used to be a userdef option. */ return true; @@ -303,17 +303,17 @@ bool GPU_mipmap_enabled(void) /** \name Context Utils * \{ */ -void GPU_flush(void) +void GPU_flush() { Context::get()->flush(); } -void GPU_finish(void) +void GPU_finish() { Context::get()->finish(); } -void GPU_apply_state(void) +void GPU_apply_state() { Context::get()->state_manager->apply_state(); } @@ -328,7 +328,7 @@ void GPU_apply_state(void) * bgl functions. * \{ */ -void GPU_bgl_start(void) +void GPU_bgl_start() { Context *ctx = Context::get(); if (!(ctx && ctx->state_manager)) { @@ -345,7 +345,7 @@ void GPU_bgl_start(void) } /* Just turn off the bgl safeguard system. Can be called even without GPU_bgl_start. */ -void GPU_bgl_end(void) +void GPU_bgl_end() { Context *ctx = Context::get(); if (!(ctx && ctx->state_manager)) { @@ -359,7 +359,7 @@ void GPU_bgl_end(void) } } -bool GPU_bgl_get(void) +bool GPU_bgl_get() { return Context::get()->state_manager->use_bgl; } @@ -381,7 +381,7 @@ void GPU_memory_barrier(eGPUBarrier barrier) /** \name Default State * \{ */ -StateManager::StateManager(void) +StateManager::StateManager() { /* Set default state. */ state.write_mask = GPU_WRITE_COLOR; diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.cc b/source/blender/gpu/intern/gpu_vertex_buffer.cc index 29fa8a89d27..be66d91b025 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.cc +++ b/source/blender/gpu/intern/gpu_vertex_buffer.cc @@ -66,13 +66,13 @@ void VertBuf::init(const GPUVertFormat *format, GPUUsageType usage) flag |= GPU_VERTBUF_INIT; } -void VertBuf::clear(void) +void VertBuf::clear() { this->release_data(); flag = GPU_VERTBUF_INVALID; } -VertBuf *VertBuf::duplicate(void) +VertBuf *VertBuf::duplicate() { VertBuf *dst = GPUBackend::get()->vertbuf_alloc(); /* Full copy. */ @@ -107,7 +107,7 @@ void VertBuf::resize(uint vert_len) flag |= GPU_VERTBUF_DATA_DIRTY; } -void VertBuf::upload(void) +void VertBuf::upload() { this->upload_data(); } @@ -125,7 +125,7 @@ using namespace blender::gpu; /* -------- Creation & deletion -------- */ -GPUVertBuf *GPU_vertbuf_calloc(void) +GPUVertBuf *GPU_vertbuf_calloc() { return wrap(GPUBackend::get()->vertbuf_alloc()); } @@ -313,7 +313,7 @@ GPUVertBufStatus GPU_vertbuf_get_status(const GPUVertBuf *verts) return unwrap(verts)->flag; } -uint GPU_vertbuf_get_memory_usage(void) +uint GPU_vertbuf_get_memory_usage() { return VertBuf::memory_usage; } -- cgit v1.2.3