From c1279768a77d093e1747f4954c9c0a959feefdf0 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Wed, 8 Dec 2021 00:31:20 -0500 Subject: Cleanup: Clang-Tidy modernize-redundant-void-arg --- source/blender/blenkernel/intern/asset.cc | 2 +- source/blender/blenkernel/intern/bvhutils.cc | 2 +- source/blender/blenkernel/intern/cryptomatte.cc | 2 +- source/blender/blenkernel/intern/icons.cc | 6 +-- source/blender/blenkernel/intern/node.cc | 22 +++++------ source/blender/blenkernel/intern/object.cc | 2 +- source/blender/blenlib/intern/mesh_intersect.cc | 4 +- source/blender/blenlib/intern/rand.cc | 2 +- source/blender/blenlib/intern/threads.cc | 31 +++++++-------- source/blender/blenlib/intern/uuid.cc | 2 +- source/blender/depsgraph/intern/depsgraph_type.cc | 4 +- source/blender/draw/intern/draw_texture_pool.cc | 2 +- .../blender/editors/animation/keyframes_keylist.cc | 2 +- source/blender/editors/asset/intern/asset_ops.cc | 2 +- .../editors/interface/interface_region_search.cc | 4 +- .../editors/interface/interface_template_list.cc | 2 +- source/blender/editors/space_node/drawnode.cc | 2 +- source/blender/editors/space_node/node_draw.cc | 2 +- source/blender/editors/space_node/node_ops.cc | 2 +- source/blender/editors/space_node/space_node.cc | 2 +- .../editors/space_spreadsheet/space_spreadsheet.cc | 2 +- source/blender/editors/util/ed_util_ops.cc | 2 +- source/blender/gpu/intern/gpu_batch.cc | 6 +-- source/blender/gpu/intern/gpu_capabilities.cc | 46 +++++++++++----------- source/blender/gpu/intern/gpu_context.cc | 8 ++-- source/blender/gpu/intern/gpu_debug.cc | 2 +- source/blender/gpu/intern/gpu_framebuffer.cc | 10 ++--- source/blender/gpu/intern/gpu_index_buffer.cc | 2 +- source/blender/gpu/intern/gpu_matrix.cc | 22 +++++------ source/blender/gpu/intern/gpu_platform.cc | 10 ++--- .../blender/gpu/intern/gpu_select_sample_query.cc | 2 +- source/blender/gpu/intern/gpu_uniform_buffer.cc | 2 +- source/blender/io/usd/intern/usd_capi_export.cc | 2 +- 33 files changed, 106 insertions(+), 109 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/asset.cc b/source/blender/blenkernel/intern/asset.cc index eaf06c99f17..e5509b09e20 100644 --- a/source/blender/blenkernel/intern/asset.cc +++ b/source/blender/blenkernel/intern/asset.cc @@ -39,7 +39,7 @@ using namespace blender; -AssetMetaData *BKE_asset_metadata_create(void) +AssetMetaData *BKE_asset_metadata_create() { AssetMetaData *asset_data = (AssetMetaData *)MEM_callocN(sizeof(*asset_data), __func__); memcpy(asset_data, DNA_struct_default_get(AssetMetaData), sizeof(*asset_data)); diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc index db4782e3952..b447d35b37b 100644 --- a/source/blender/blenkernel/intern/bvhutils.cc +++ b/source/blender/blenkernel/intern/bvhutils.cc @@ -125,7 +125,7 @@ bool bvhcache_has_tree(const BVHCache *bvh_cache, const BVHTree *tree) return false; } -BVHCache *bvhcache_init(void) +BVHCache *bvhcache_init() { BVHCache *cache = (BVHCache *)MEM_callocN(sizeof(BVHCache), __func__); BLI_mutex_init(&cache->mutex); diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc index 02fba2aa5a4..d532ed9e4b2 100644 --- a/source/blender/blenkernel/intern/cryptomatte.cc +++ b/source/blender/blenkernel/intern/cryptomatte.cc @@ -139,7 +139,7 @@ std::optional CryptomatteSession::operator[](float encoded_hash) co return std::nullopt; } -CryptomatteSession *BKE_cryptomatte_init(void) +CryptomatteSession *BKE_cryptomatte_init() { CryptomatteSession *session = new CryptomatteSession(); return session; diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc index 7df8e0e1fc0..c7cdf81deaf 100644 --- a/source/blender/blenkernel/intern/icons.cc +++ b/source/blender/blenkernel/intern/icons.cc @@ -210,7 +210,7 @@ void BKE_icons_init(int first_dyn_id) } } -void BKE_icons_free(void) +void BKE_icons_free() { BLI_assert(BLI_thread_is_main()); @@ -227,7 +227,7 @@ void BKE_icons_free(void) BLI_linklist_lockfree_free(&g_icon_delete_queue, MEM_freeN); } -void BKE_icons_deferred_free(void) +void BKE_icons_deferred_free() { std::scoped_lock lock(gIconMutex); @@ -271,7 +271,7 @@ static PreviewImage *previewimg_deferred_create(const char *path, int source) return prv; } -PreviewImage *BKE_previewimg_create(void) +PreviewImage *BKE_previewimg_create() { return previewimg_create_ex(0); } diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index b1de2c5a848..4b4c87de9d4 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -1365,7 +1365,7 @@ bool ntreeIsRegistered(bNodeTree *ntree) return (ntree->typeinfo != &NodeTreeTypeUndefined); } -GHashIterator *ntreeTypeGetIterator(void) +GHashIterator *ntreeTypeGetIterator() { return BLI_ghashIterator_new(nodetreetypes_hash); } @@ -1450,7 +1450,7 @@ bool nodeTypeUndefined(const bNode *node) ID_IS_LINKED(node->id) && (node->id->tag & LIB_TAG_MISSING)); } -GHashIterator *nodeTypeGetIterator(void) +GHashIterator *nodeTypeGetIterator() { return BLI_ghashIterator_new(nodetypes_hash); } @@ -1498,7 +1498,7 @@ bool nodeSocketIsRegistered(bNodeSocket *sock) return (sock->typeinfo != &NodeSocketTypeUndefined); } -GHashIterator *nodeSocketTypeGetIterator(void) +GHashIterator *nodeSocketTypeGetIterator() { return BLI_ghashIterator_new(nodesockettypes_hash); } @@ -4057,7 +4057,7 @@ void BKE_node_clipboard_init(const struct bNodeTree *ntree) node_clipboard.type = ntree->type; } -void BKE_node_clipboard_clear(void) +void BKE_node_clipboard_clear() { LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &node_clipboard.links) { nodeRemLink(nullptr, link); @@ -4074,7 +4074,7 @@ void BKE_node_clipboard_clear(void) #endif } -bool BKE_node_clipboard_validate(void) +bool BKE_node_clipboard_validate() { bool ok = true; @@ -4152,22 +4152,22 @@ void BKE_node_clipboard_add_link(bNodeLink *link) BLI_addtail(&node_clipboard.links, link); } -const ListBase *BKE_node_clipboard_get_nodes(void) +const ListBase *BKE_node_clipboard_get_nodes() { return &node_clipboard.nodes; } -const ListBase *BKE_node_clipboard_get_links(void) +const ListBase *BKE_node_clipboard_get_links() { return &node_clipboard.links; } -int BKE_node_clipboard_get_type(void) +int BKE_node_clipboard_get_type() { return node_clipboard.type; } -void BKE_node_clipboard_free(void) +void BKE_node_clipboard_free() { BKE_node_clipboard_validate(); BKE_node_clipboard_clear(); @@ -5899,7 +5899,7 @@ static void registerFunctionNodes() register_node_type_fn_value_to_string(); } -void BKE_node_system_init(void) +void BKE_node_system_init() { nodetreetypes_hash = BLI_ghash_str_new("nodetreetypes_hash gh"); nodetypes_hash = BLI_ghash_str_new("nodetypes_hash gh"); @@ -5926,7 +5926,7 @@ void BKE_node_system_init(void) registerFunctionNodes(); } -void BKE_node_system_exit(void) +void BKE_node_system_exit() { if (nodetypes_hash) { NODE_TYPES_BEGIN (nt) { diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 4327e7357d7..3628b522f76 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -3792,7 +3792,7 @@ void BKE_object_apply_mat4(Object *ob, /** \name Object Bounding Box API * \{ */ -BoundBox *BKE_boundbox_alloc_unit(void) +BoundBox *BKE_boundbox_alloc_unit() { const float min[3] = {-1.0f, -1.0f, -1.0f}, max[3] = {1.0f, 1.0f, 1.0f}; diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index a09276a1abb..1af4dfb029d 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -3195,7 +3195,7 @@ struct PerfCounts { static PerfCounts *perfdata = nullptr; -static void perfdata_init(void) +static void perfdata_init() { perfdata = new PerfCounts; @@ -3247,7 +3247,7 @@ static void doperfmax(int maxnum, int val) perfdata->max[maxnum] = max_ii(perfdata->max[maxnum], val); } -static void dump_perfdata(void) +static void dump_perfdata() { std::cout << "\nPERFDATA\n"; for (int i : perfdata->count.index_range()) { diff --git a/source/blender/blenlib/intern/rand.cc b/source/blender/blenlib/intern/rand.cc index db5e08d37ce..606d2611112 100644 --- a/source/blender/blenlib/intern/rand.cc +++ b/source/blender/blenlib/intern/rand.cc @@ -272,7 +272,7 @@ struct RNG_THREAD_ARRAY { RNG rng_tab[BLENDER_MAX_THREADS]; }; -RNG_THREAD_ARRAY *BLI_rng_threaded_new(void) +RNG_THREAD_ARRAY *BLI_rng_threaded_new() { unsigned int i; RNG_THREAD_ARRAY *rngarr = (RNG_THREAD_ARRAY *)MEM_mallocN(sizeof(RNG_THREAD_ARRAY), diff --git a/source/blender/blenlib/intern/threads.cc b/source/blender/blenlib/intern/threads.cc index 35097013439..15bdb08f89f 100644 --- a/source/blender/blenlib/intern/threads.cc +++ b/source/blender/blenlib/intern/threads.cc @@ -140,7 +140,7 @@ struct ThreadSlot { int avail; }; -void BLI_threadapi_init(void) +void BLI_threadapi_init() { mainid = pthread_self(); if (numaAPI_Initialize() == NUMAAPI_SUCCESS) { @@ -148,7 +148,7 @@ void BLI_threadapi_init(void) } } -void BLI_threadapi_exit(void) +void BLI_threadapi_exit() { } @@ -231,7 +231,7 @@ static void *tslot_thread_start(void *tslot_p) return tslot->do_thread(tslot->callerdata); } -int BLI_thread_is_main(void) +int BLI_thread_is_main() { return pthread_equal(pthread_self(), mainid); } @@ -306,7 +306,7 @@ void BLI_threadpool_end(ListBase *threadbase) /* System Information */ /* how many threads are native on this system? */ -int BLI_system_thread_count(void) +int BLI_system_thread_count() { static int t = -1; @@ -347,7 +347,7 @@ void BLI_system_num_threads_override_set(int num) num_threads_override = num; } -int BLI_system_num_threads_override_get(void) +int BLI_system_num_threads_override_get() { return num_threads_override; } @@ -418,7 +418,7 @@ void BLI_mutex_end(ThreadMutex *mutex) pthread_mutex_destroy(mutex); } -ThreadMutex *BLI_mutex_alloc(void) +ThreadMutex *BLI_mutex_alloc() { ThreadMutex *mutex = static_cast(MEM_callocN(sizeof(ThreadMutex), "ThreadMutex")); BLI_mutex_init(mutex); @@ -533,7 +533,7 @@ void BLI_rw_mutex_end(ThreadRWMutex *mutex) pthread_rwlock_destroy(mutex); } -ThreadRWMutex *BLI_rw_mutex_alloc(void) +ThreadRWMutex *BLI_rw_mutex_alloc() { ThreadRWMutex *mutex = static_cast( MEM_callocN(sizeof(ThreadRWMutex), "ThreadRWMutex")); @@ -555,7 +555,7 @@ struct TicketMutex { unsigned int queue_head, queue_tail; }; -TicketMutex *BLI_ticket_mutex_alloc(void) +TicketMutex *BLI_ticket_mutex_alloc() { TicketMutex *ticket = static_cast( MEM_callocN(sizeof(TicketMutex), "TicketMutex")); @@ -640,7 +640,7 @@ struct ThreadQueue { volatile int canceled; }; -ThreadQueue *BLI_thread_queue_init(void) +ThreadQueue *BLI_thread_queue_init() { ThreadQueue *queue; @@ -818,8 +818,7 @@ void BLI_thread_queue_wait_finish(ThreadQueue *queue) /* **** Special functions to help performance on crazy NUMA setups. **** */ #if 0 /* UNUSED */ -static bool check_is_threadripper2_alike_topology(void) -{ +static bool check_is_threadripper2_alike_topology(){ /* NOTE: We hope operating system does not support CPU hot-swap to * a different brand. And that SMP of different types is also not * encouraged by the system. */ @@ -860,8 +859,7 @@ static bool check_is_threadripper2_alike_topology(void) return is_threadripper2; } -static void threadripper_put_process_on_fast_node(void) -{ +static void threadripper_put_process_on_fast_node(){ if (!is_numa_available) { return; } @@ -880,8 +878,7 @@ static void threadripper_put_process_on_fast_node(void) numaAPI_RunProcessOnNode(0); } -static void threadripper_put_thread_on_fast_node(void) -{ +static void threadripper_put_thread_on_fast_node(){ if (!is_numa_available) { return; } @@ -899,7 +896,7 @@ static void threadripper_put_thread_on_fast_node(void) } #endif /* UNUSED */ -void BLI_thread_put_process_on_fast_node(void) +void BLI_thread_put_process_on_fast_node() { /* Disabled for now since this causes only 16 threads to be used on a * thread-ripper for computations like sculpting and fluid sim. The problem @@ -915,7 +912,7 @@ void BLI_thread_put_process_on_fast_node(void) #endif } -void BLI_thread_put_thread_on_fast_node(void) +void BLI_thread_put_thread_on_fast_node() { /* Disabled for now, see comment above. */ #if 0 diff --git a/source/blender/blenlib/intern/uuid.cc b/source/blender/blenlib/intern/uuid.cc index de4602bf3ed..e2578ffa7c7 100644 --- a/source/blender/blenlib/intern/uuid.cc +++ b/source/blender/blenlib/intern/uuid.cc @@ -81,7 +81,7 @@ bUUID BLI_uuid_generate_random() return uuid; } -bUUID BLI_uuid_nil(void) +bUUID BLI_uuid_nil() { const bUUID nil = {0, 0, 0, 0, 0, {0}}; return nil; diff --git a/source/blender/depsgraph/intern/depsgraph_type.cc b/source/blender/depsgraph/intern/depsgraph_type.cc index 07664cb4f0b..43a21692f2a 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.cc +++ b/source/blender/depsgraph/intern/depsgraph_type.cc @@ -40,7 +40,7 @@ namespace deg = blender::deg; /* Register all node types */ -void DEG_register_node_types(void) +void DEG_register_node_types() { /* register node types */ deg::deg_register_base_depsnodes(); @@ -49,7 +49,7 @@ void DEG_register_node_types(void) } /* Free registry on exit */ -void DEG_free_node_types(void) +void DEG_free_node_types() { } diff --git a/source/blender/draw/intern/draw_texture_pool.cc b/source/blender/draw/intern/draw_texture_pool.cc index 709bf808874..472b65519d4 100644 --- a/source/blender/draw/intern/draw_texture_pool.cc +++ b/source/blender/draw/intern/draw_texture_pool.cc @@ -40,7 +40,7 @@ struct DRWTexturePool { int last_user_id = -1; }; -DRWTexturePool *DRW_texture_pool_create(void) +DRWTexturePool *DRW_texture_pool_create() { return new DRWTexturePool(); } diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc index 7d08e416d0d..8dae46766fa 100644 --- a/source/blender/editors/animation/keyframes_keylist.cc +++ b/source/blender/editors/animation/keyframes_keylist.cc @@ -109,7 +109,7 @@ struct AnimKeylist { #endif }; -AnimKeylist *ED_keylist_create(void) +AnimKeylist *ED_keylist_create() { AnimKeylist *keylist = new AnimKeylist(); return keylist; diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index 8bd8a8f73c2..4fec6e3d055 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -946,7 +946,7 @@ static bool has_external_files(Main *bmain, struct ReportList *reports) /* -------------------------------------------------------------------- */ -void ED_operatortypes_asset(void) +void ED_operatortypes_asset() { WM_operatortype_append(ASSET_OT_mark); WM_operatortype_append(ASSET_OT_clear); diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index eaf1ed3693b..93063b1b1c9 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -186,12 +186,12 @@ bool UI_search_item_add(uiSearchItems *items, return true; } -int UI_searchbox_size_y(void) +int UI_searchbox_size_y() { return SEARCH_ITEMS * UI_UNIT_Y + 2 * UI_POPUP_MENU_TOP; } -int UI_searchbox_size_x(void) +int UI_searchbox_size_x() { return 12 * UI_UNIT_X; } diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc index 845a7813da2..d24b2ba4c59 100644 --- a/source/blender/editors/interface/interface_template_list.cc +++ b/source/blender/editors/interface/interface_template_list.cc @@ -1325,7 +1325,7 @@ PointerRNA *UI_list_custom_drag_operator_set(uiList *ui_list, /** \name List-types Registration * \{ */ -void ED_uilisttypes_ui(void) +void ED_uilisttypes_ui() { WM_uilisttype_add(UI_UL_asset_view()); } diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index b3c88dafe91..2fda7af3c14 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -3073,7 +3073,7 @@ static void node_socket_undefined_interface_draw_color(bContext *UNUSED(C), /** \} */ -void ED_node_init_butfuncs(void) +void ED_node_init_butfuncs() { /* Fallback types for undefined tree, nodes, sockets * Defined in blenkernel, but not registered in type hashes. diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index dda4b0b1d10..48a81f3dc3a 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -106,7 +106,7 @@ extern void ui_draw_dropshadow( const rctf *rct, float radius, float aspect, float alpha, int select); } -float ED_node_grid_size(void) +float ED_node_grid_size() { return U.widget_unit; } diff --git a/source/blender/editors/space_node/node_ops.cc b/source/blender/editors/space_node/node_ops.cc index 4c08f4d7b47..a6264f151e4 100644 --- a/source/blender/editors/space_node/node_ops.cc +++ b/source/blender/editors/space_node/node_ops.cc @@ -127,7 +127,7 @@ void node_operatortypes() WM_operatortype_append(NODE_OT_cryptomatte_layer_remove); } -void ED_operatormacros_node(void) +void ED_operatormacros_node() { wmOperatorType *ot; wmOperatorTypeMacro *mot; diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc index b57f091b1d7..714142ef471 100644 --- a/source/blender/editors/space_node/space_node.cc +++ b/source/blender/editors/space_node/space_node.cc @@ -996,7 +996,7 @@ static void node_space_subtype_item_extend(bContext *C, EnumPropertyItem **item, } /* only called once, from space/spacetypes.c */ -void ED_spacetype_node(void) +void ED_spacetype_node() { SpaceType *st = (SpaceType *)MEM_callocN(sizeof(SpaceType), "spacetype node"); ARegionType *art; diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index b37706e02e8..0cb4a52eb2f 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -617,7 +617,7 @@ static void spreadsheet_right_region_listener(const wmRegionListenerParams *UNUS { } -void ED_spacetype_spreadsheet(void) +void ED_spacetype_spreadsheet() { SpaceType *st = (SpaceType *)MEM_callocN(sizeof(SpaceType), "spacetype spreadsheet"); ARegionType *art; diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc index df6e093c57a..a1b17d799bc 100644 --- a/source/blender/editors/util/ed_util_ops.cc +++ b/source/blender/editors/util/ed_util_ops.cc @@ -276,7 +276,7 @@ static void ED_OT_flush_edits(wmOperatorType *ot) /** \} */ -void ED_operatortypes_edutils(void) +void ED_operatortypes_edutils() { WM_operatortype_append(ED_OT_lib_id_load_custom_preview); WM_operatortype_append(ED_OT_lib_id_generate_preview); diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc index 0e5c7900da9..6ff67e1f043 100644 --- a/source/blender/gpu/intern/gpu_batch.cc +++ b/source/blender/gpu/intern/gpu_batch.cc @@ -50,7 +50,7 @@ using namespace blender::gpu; /** \name Creation & Deletion * \{ */ -GPUBatch *GPU_batch_calloc(void) +GPUBatch *GPU_batch_calloc() { GPUBatch *batch = GPUBackend::get()->batch_alloc(); memset(batch, 0, sizeof(*batch)); @@ -315,12 +315,12 @@ void GPU_batch_program_set_imm_shader(GPUBatch *batch) /** \name Init/Exit * \{ */ -void gpu_batch_init(void) +void gpu_batch_init() { gpu_batch_presets_init(); } -void gpu_batch_exit(void) +void gpu_batch_exit() { gpu_batch_presets_exit(); } diff --git a/source/blender/gpu/intern/gpu_capabilities.cc b/source/blender/gpu/intern/gpu_capabilities.cc index c6e9dc210cb..fe04d1db03c 100644 --- a/source/blender/gpu/intern/gpu_capabilities.cc +++ b/source/blender/gpu/intern/gpu_capabilities.cc @@ -44,7 +44,7 @@ using namespace blender::gpu; /** \name Capabilities * \{ */ -int GPU_max_texture_size(void) +int GPU_max_texture_size() { return GCaps.max_texture_size; } @@ -57,27 +57,27 @@ int GPU_texture_size_with_limit(int res, bool limit_gl_texture_size) return min_ii(reslimit, res); } -int GPU_max_texture_layers(void) +int GPU_max_texture_layers() { return GCaps.max_texture_layers; } -int GPU_max_textures_vert(void) +int GPU_max_textures_vert() { return GCaps.max_textures_vert; } -int GPU_max_textures_geom(void) +int GPU_max_textures_geom() { return GCaps.max_textures_geom; } -int GPU_max_textures_frag(void) +int GPU_max_textures_frag() { return GCaps.max_textures_frag; } -int GPU_max_textures(void) +int GPU_max_textures() { return GCaps.max_textures; } @@ -92,37 +92,37 @@ int GPU_max_work_group_size(int index) return GCaps.max_work_group_size[index]; } -int GPU_max_uniforms_vert(void) +int GPU_max_uniforms_vert() { return GCaps.max_uniforms_vert; } -int GPU_max_uniforms_frag(void) +int GPU_max_uniforms_frag() { return GCaps.max_uniforms_frag; } -int GPU_max_batch_indices(void) +int GPU_max_batch_indices() { return GCaps.max_batch_indices; } -int GPU_max_batch_vertices(void) +int GPU_max_batch_vertices() { return GCaps.max_batch_vertices; } -int GPU_max_vertex_attribs(void) +int GPU_max_vertex_attribs() { return GCaps.max_vertex_attribs; } -int GPU_max_varying_floats(void) +int GPU_max_varying_floats() { return GCaps.max_varying_floats; } -int GPU_extensions_len(void) +int GPU_extensions_len() { return GCaps.extensions_len; } @@ -132,43 +132,43 @@ const char *GPU_extension_get(int i) return GCaps.extension_get ? GCaps.extension_get(i) : "\0"; } -bool GPU_mip_render_workaround(void) +bool GPU_mip_render_workaround() { return GCaps.mip_render_workaround; } -bool GPU_depth_blitting_workaround(void) +bool GPU_depth_blitting_workaround() { return GCaps.depth_blitting_workaround; } -bool GPU_use_main_context_workaround(void) +bool GPU_use_main_context_workaround() { return GCaps.use_main_context_workaround; } -bool GPU_crappy_amd_driver(void) +bool GPU_crappy_amd_driver() { /* Currently are the same drivers with the `unused_fb_slot` problem. */ return GCaps.broken_amd_driver; } -bool GPU_use_hq_normals_workaround(void) +bool GPU_use_hq_normals_workaround() { return GCaps.use_hq_normals_workaround; } -bool GPU_compute_shader_support(void) +bool GPU_compute_shader_support() { return GCaps.compute_shader_support; } -bool GPU_shader_storage_buffer_objects_support(void) +bool GPU_shader_storage_buffer_objects_support() { return GCaps.shader_storage_buffer_objects_support; } -bool GPU_shader_image_load_store_support(void) +bool GPU_shader_image_load_store_support() { return GCaps.shader_image_load_store_support; } @@ -179,7 +179,7 @@ bool GPU_shader_image_load_store_support(void) /** \name Memory statistics * \{ */ -bool GPU_mem_stats_supported(void) +bool GPU_mem_stats_supported() { return GCaps.mem_stats_support; } @@ -190,7 +190,7 @@ void GPU_mem_stats_get(int *totalmem, int *freemem) } /* Return support for the active context + window. */ -bool GPU_stereo_quadbuffer_support(void) +bool GPU_stereo_quadbuffer_support() { return Context::get()->front_right != nullptr; } diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc index 943a6151ced..85be7b593eb 100644 --- a/source/blender/gpu/intern/gpu_context.cc +++ b/source/blender/gpu/intern/gpu_context.cc @@ -133,7 +133,7 @@ void GPU_context_active_set(GPUContext *ctx_) } } -GPUContext *GPU_context_active_get(void) +GPUContext *GPU_context_active_get() { return wrap(Context::get()); } @@ -146,12 +146,12 @@ GPUContext *GPU_context_active_get(void) static std::mutex main_context_mutex; -void GPU_context_main_lock(void) +void GPU_context_main_lock() { main_context_mutex.lock(); } -void GPU_context_main_unlock(void) +void GPU_context_main_unlock() { main_context_mutex.unlock(); } @@ -180,7 +180,7 @@ void GPU_backend_init(eGPUBackendType backend_type) } } -void GPU_backend_exit(void) +void GPU_backend_exit() { /* TODO: assert no resource left. Currently UI textures are still not freed in their context * correctly. */ diff --git a/source/blender/gpu/intern/gpu_debug.cc b/source/blender/gpu/intern/gpu_debug.cc index 2d9fb7822ae..5f061bd1bee 100644 --- a/source/blender/gpu/intern/gpu_debug.cc +++ b/source/blender/gpu/intern/gpu_debug.cc @@ -45,7 +45,7 @@ void GPU_debug_group_begin(const char *name) ctx->debug_group_begin(name, stack.size()); } -void GPU_debug_group_end(void) +void GPU_debug_group_end() { if (!(G.debug & G_DEBUG_GPU)) { return; diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc index 9099a6e4245..ea37afd2885 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.cc +++ b/source/blender/gpu/intern/gpu_framebuffer.cc @@ -240,19 +240,19 @@ void GPU_backbuffer_bind(eGPUBackBuffer buffer) } } -void GPU_framebuffer_restore(void) +void GPU_framebuffer_restore() { Context::get()->back_left->bind(false); } -GPUFrameBuffer *GPU_framebuffer_active_get(void) +GPUFrameBuffer *GPU_framebuffer_active_get() { Context *ctx = Context::get(); return wrap(ctx ? ctx->active_fb : nullptr); } /* Returns the default frame-buffer. Will always exists even if it's just a dummy. */ -GPUFrameBuffer *GPU_framebuffer_back_get(void) +GPUFrameBuffer *GPU_framebuffer_back_get() { Context *ctx = Context::get(); return wrap(ctx ? ctx->back_left : nullptr); @@ -514,14 +514,14 @@ void GPU_framebuffer_push(GPUFrameBuffer *fb) FrameBufferStack.top++; } -GPUFrameBuffer *GPU_framebuffer_pop(void) +GPUFrameBuffer *GPU_framebuffer_pop() { BLI_assert(FrameBufferStack.top > 0); FrameBufferStack.top--; return FrameBufferStack.framebuffers[FrameBufferStack.top]; } -uint GPU_framebuffer_stack_level_get(void) +uint GPU_framebuffer_stack_level_get() { return FrameBufferStack.top; } diff --git a/source/blender/gpu/intern/gpu_index_buffer.cc b/source/blender/gpu/intern/gpu_index_buffer.cc index be7470e79c1..3472cc24a74 100644 --- a/source/blender/gpu/intern/gpu_index_buffer.cc +++ b/source/blender/gpu/intern/gpu_index_buffer.cc @@ -349,7 +349,7 @@ uint32_t *IndexBuf::unmap(const uint32_t *mapped_memory) const /** \name C-API * \{ */ -GPUIndexBuf *GPU_indexbuf_calloc(void) +GPUIndexBuf *GPU_indexbuf_calloc() { return wrap(GPUBackend::get()->indexbuf_alloc()); } diff --git a/source/blender/gpu/intern/gpu_matrix.cc b/source/blender/gpu/intern/gpu_matrix.cc index bbcc241f5e3..0cc0e944301 100644 --- a/source/blender/gpu/intern/gpu_matrix.cc +++ b/source/blender/gpu/intern/gpu_matrix.cc @@ -67,7 +67,7 @@ struct GPUMatrixState { #define ProjectionStack Context::get()->matrix_state->projection_stack #define Projection ProjectionStack.stack[ProjectionStack.top] -GPUMatrixState *GPU_matrix_state_create(void) +GPUMatrixState *GPU_matrix_state_create() { #define MATRIX_4X4_IDENTITY \ { \ @@ -99,7 +99,7 @@ static void gpu_matrix_state_active_set_dirty(bool value) state->dirty = value; } -void GPU_matrix_reset(void) +void GPU_matrix_reset() { GPUMatrixState *state = Context::get()->matrix_state; state->model_view_stack.top = 0; @@ -132,28 +132,28 @@ static void checkmat(cosnt float *m) #endif -void GPU_matrix_push(void) +void GPU_matrix_push() { BLI_assert(ModelViewStack.top + 1 < MATRIX_STACK_DEPTH); ModelViewStack.top++; copy_m4_m4(ModelView, ModelViewStack.stack[ModelViewStack.top - 1]); } -void GPU_matrix_pop(void) +void GPU_matrix_pop() { BLI_assert(ModelViewStack.top > 0); ModelViewStack.top--; gpu_matrix_state_active_set_dirty(true); } -void GPU_matrix_push_projection(void) +void GPU_matrix_push_projection() { BLI_assert(ProjectionStack.top + 1 < MATRIX_STACK_DEPTH); ProjectionStack.top++; copy_m4_m4(Projection, ProjectionStack.stack[ProjectionStack.top - 1]); } -void GPU_matrix_pop_projection(void) +void GPU_matrix_pop_projection() { BLI_assert(ProjectionStack.top > 0); ProjectionStack.top--; @@ -167,7 +167,7 @@ void GPU_matrix_set(const float m[4][4]) gpu_matrix_state_active_set_dirty(true); } -void GPU_matrix_identity_projection_set(void) +void GPU_matrix_identity_projection_set() { unit_m4(Projection); CHECKMAT(Projection3D); @@ -181,7 +181,7 @@ void GPU_matrix_projection_set(const float m[4][4]) gpu_matrix_state_active_set_dirty(true); } -void GPU_matrix_identity_set(void) +void GPU_matrix_identity_set() { unit_m4(ModelView); gpu_matrix_state_active_set_dirty(true); @@ -668,7 +668,7 @@ void GPU_matrix_bind(GPUShader *shader) gpu_matrix_state_active_set_dirty(false); } -bool GPU_matrix_dirty_get(void) +bool GPU_matrix_dirty_get() { GPUMatrixState *state = Context::get()->matrix_state; return state->dirty; @@ -681,13 +681,13 @@ BLI_STATIC_ASSERT(GPU_PY_MATRIX_STACK_LEN + 1 == MATRIX_STACK_DEPTH, "define mis /* Return int since caller is may subtract. */ -int GPU_matrix_stack_level_get_model_view(void) +int GPU_matrix_stack_level_get_model_view() { GPUMatrixState *state = Context::get()->matrix_state; return (int)state->model_view_stack.top; } -int GPU_matrix_stack_level_get_projection(void) +int GPU_matrix_stack_level_get_projection() { GPUMatrixState *state = Context::get()->matrix_state; return (int)state->projection_stack.top; diff --git a/source/blender/gpu/intern/gpu_platform.cc b/source/blender/gpu/intern/gpu_platform.cc index 49dde473300..907dfa0fc1a 100644 --- a/source/blender/gpu/intern/gpu_platform.cc +++ b/source/blender/gpu/intern/gpu_platform.cc @@ -127,31 +127,31 @@ eGPUSupportLevel GPU_platform_support_level() return GPG.support_level; } -const char *GPU_platform_vendor(void) +const char *GPU_platform_vendor() { BLI_assert(GPG.initialized); return GPG.vendor; } -const char *GPU_platform_renderer(void) +const char *GPU_platform_renderer() { BLI_assert(GPG.initialized); return GPG.renderer; } -const char *GPU_platform_version(void) +const char *GPU_platform_version() { BLI_assert(GPG.initialized); return GPG.version; } -const char *GPU_platform_support_level_key(void) +const char *GPU_platform_support_level_key() { BLI_assert(GPG.initialized); return GPG.support_key; } -const char *GPU_platform_gpu_name(void) +const char *GPU_platform_gpu_name() { BLI_assert(GPG.initialized); return GPG.gpu_name; diff --git a/source/blender/gpu/intern/gpu_select_sample_query.cc b/source/blender/gpu/intern/gpu_select_sample_query.cc index 047ce0cfb35..a430d4a9d62 100644 --- a/source/blender/gpu/intern/gpu_select_sample_query.cc +++ b/source/blender/gpu/intern/gpu_select_sample_query.cc @@ -151,7 +151,7 @@ bool gpu_select_query_load_id(uint id) return true; } -uint gpu_select_query_end(void) +uint gpu_select_query_end() { uint hits = 0; const uint maxhits = g_query_state.bufsize; diff --git a/source/blender/gpu/intern/gpu_uniform_buffer.cc b/source/blender/gpu/intern/gpu_uniform_buffer.cc index 3a9269d1753..6f2e9838955 100644 --- a/source/blender/gpu/intern/gpu_uniform_buffer.cc +++ b/source/blender/gpu/intern/gpu_uniform_buffer.cc @@ -245,7 +245,7 @@ void GPU_uniformbuf_unbind(GPUUniformBuf *ubo) unwrap(ubo)->unbind(); } -void GPU_uniformbuf_unbind_all(void) +void GPU_uniformbuf_unbind_all() { /* FIXME */ } diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc index efa31df25c1..0cc3fde8c6c 100644 --- a/source/blender/io/usd/intern/usd_capi_export.cc +++ b/source/blender/io/usd/intern/usd_capi_export.cc @@ -223,7 +223,7 @@ bool USD_export(bContext *C, return export_ok; } -int USD_get_version(void) +int USD_get_version() { /* USD 19.11 defines: * -- cgit v1.2.3