Skip to content

Commit 4599ce2

Browse files
Remove unnecessary static in source
The `static` specifier is used inconsistently throughout the codebase. This commit removes it from most places where it is unnecessary. Static's purpose is to make any function defined inside of a translation unit unuseable from other translation units. But because we use header files to define which functions are exposed, we can simply omit static for functions private in a translation unit. This commit also removes static in a couple of places where it isn't needed, such as local variables that do not act as storage beyond the scope of the function, and for global variables defined inside of implenetation files. Uses of static in header files, such as vk_loader_platform.h, is left as is because those functions need static to prevent multiple definition errors.
1 parent 9f5ae79 commit 4599ce2

13 files changed

+172
-181
lines changed

loader/debug_utils.c

+20-18
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ VkResult util_CreateDebugUtilsMessenger(struct loader_instance *inst, const VkDe
6666
return VK_SUCCESS;
6767
}
6868

69-
static VKAPI_ATTR VkResult VKAPI_CALL
70-
debug_utils_CreateDebugUtilsMessengerEXT(VkInstance instance, const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,
71-
const VkAllocationCallbacks *pAllocator, VkDebugUtilsMessengerEXT *pMessenger) {
69+
VKAPI_ATTR VkResult VKAPI_CALL debug_utils_CreateDebugUtilsMessengerEXT(VkInstance instance,
70+
const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,
71+
const VkAllocationCallbacks *pAllocator,
72+
VkDebugUtilsMessengerEXT *pMessenger) {
7273
struct loader_instance *inst = loader_get_instance(instance);
7374
loader_platform_thread_lock_mutex(&loader_lock);
7475
VkResult result = inst->disp->layer_inst_disp.CreateDebugUtilsMessengerEXT(inst->instance, pCreateInfo, pAllocator, pMessenger);
@@ -149,16 +150,17 @@ VkResult util_CreateDebugUtilsMessengers(struct loader_instance *inst, const voi
149150
return VK_SUCCESS;
150151
}
151152

152-
static VKAPI_ATTR void VKAPI_CALL debug_utils_SubmitDebugUtilsMessageEXT(
153-
VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes,
154-
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) {
153+
VKAPI_ATTR void VKAPI_CALL debug_utils_SubmitDebugUtilsMessageEXT(VkInstance instance,
154+
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
155+
VkDebugUtilsMessageTypeFlagsEXT messageTypes,
156+
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) {
155157
struct loader_instance *inst = loader_get_instance(instance);
156158

157159
inst->disp->layer_inst_disp.SubmitDebugUtilsMessageEXT(inst->instance, messageSeverity, messageTypes, pCallbackData);
158160
}
159161

160-
static VKAPI_ATTR void VKAPI_CALL debug_utils_DestroyDebugUtilsMessengerEXT(VkInstance instance, VkDebugUtilsMessengerEXT messenger,
161-
const VkAllocationCallbacks *pAllocator) {
162+
VKAPI_ATTR void VKAPI_CALL debug_utils_DestroyDebugUtilsMessengerEXT(VkInstance instance, VkDebugUtilsMessengerEXT messenger,
163+
const VkAllocationCallbacks *pAllocator) {
162164
struct loader_instance *inst = loader_get_instance(instance);
163165
loader_platform_thread_lock_mutex(&loader_lock);
164166

@@ -308,9 +310,10 @@ VkResult util_CreateDebugReportCallback(struct loader_instance *inst, const VkDe
308310
return VK_SUCCESS;
309311
}
310312

311-
static VKAPI_ATTR VkResult VKAPI_CALL
312-
debug_utils_CreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo,
313-
const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback) {
313+
VKAPI_ATTR VkResult VKAPI_CALL debug_utils_CreateDebugReportCallbackEXT(VkInstance instance,
314+
const VkDebugReportCallbackCreateInfoEXT *pCreateInfo,
315+
const VkAllocationCallbacks *pAllocator,
316+
VkDebugReportCallbackEXT *pCallback) {
314317
struct loader_instance *inst = loader_get_instance(instance);
315318
loader_platform_thread_lock_mutex(&loader_lock);
316319
VkResult result = inst->disp->layer_inst_disp.CreateDebugReportCallbackEXT(inst->instance, pCreateInfo, pAllocator, pCallback);
@@ -399,8 +402,8 @@ VkResult util_CreateDebugReportCallbacks(struct loader_instance *inst, const voi
399402
return VK_SUCCESS;
400403
}
401404

402-
static VKAPI_ATTR void VKAPI_CALL debug_utils_DestroyDebugReportCallbackEXT(VkInstance instance, VkDebugReportCallbackEXT callback,
403-
const VkAllocationCallbacks *pAllocator) {
405+
VKAPI_ATTR void VKAPI_CALL debug_utils_DestroyDebugReportCallbackEXT(VkInstance instance, VkDebugReportCallbackEXT callback,
406+
const VkAllocationCallbacks *pAllocator) {
404407
struct loader_instance *inst = loader_get_instance(instance);
405408
loader_platform_thread_lock_mutex(&loader_lock);
406409

@@ -409,10 +412,9 @@ static VKAPI_ATTR void VKAPI_CALL debug_utils_DestroyDebugReportCallbackEXT(VkIn
409412
loader_platform_thread_unlock_mutex(&loader_lock);
410413
}
411414

412-
static VKAPI_ATTR void VKAPI_CALL debug_utils_DebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags,
413-
VkDebugReportObjectTypeEXT objType, uint64_t object,
414-
size_t location, int32_t msgCode, const char *pLayerPrefix,
415-
const char *pMsg) {
415+
VKAPI_ATTR void VKAPI_CALL debug_utils_DebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags,
416+
VkDebugReportObjectTypeEXT objType, uint64_t object, size_t location,
417+
int32_t msgCode, const char *pLayerPrefix, const char *pMsg) {
416418
struct loader_instance *inst = loader_get_instance(instance);
417419

418420
inst->disp->layer_inst_disp.DebugReportMessageEXT(inst->instance, flags, objType, object, location, msgCode, pLayerPrefix,
@@ -548,7 +550,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_DebugReportMessageEXT(VkInstance instance,
548550

549551
// General utilities
550552

551-
static const VkExtensionProperties debug_utils_extension_info[] = {
553+
const VkExtensionProperties debug_utils_extension_info[] = {
552554
{VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION},
553555
{VK_EXT_DEBUG_UTILS_EXTENSION_NAME, VK_EXT_DEBUG_UTILS_SPEC_VERSION},
554556
};

0 commit comments

Comments
 (0)