diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2015-11-30 15:22:41 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-17 11:20:06 -0700 |
| commit | cccdce19011d78fcf3898e8f7385b3619f4a8a0a (patch) | |
| tree | 77eb74c3d4dedded7e26ae376ec39cc4febb5c43 /loader | |
| parent | 2dafae41b1f79bfb462eb37c1fdf3479879d9485 (diff) | |
| download | usermoji-cccdce19011d78fcf3898e8f7385b3619f4a8a0a.tar.xz | |
debug_report: make destroy have void return value
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/debug_report.c | 9 | ||||
| -rw-r--r-- | loader/debug_report.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/loader/debug_report.c b/loader/debug_report.c index f6b3a31a..5ef00ebf 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -92,7 +92,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL debug_report_CreateDebugReportCallback( return result; } -static VKAPI_ATTR VkResult VKAPI_CALL debug_report_DestroyDebugReportCallback( +static VKAPI_ATTR void VKAPI_CALL debug_report_DestroyDebugReportCallback( VkInstance instance, VkDebugReportCallbackLUNARG callback, VkAllocationCallbacks *pAllocator) @@ -102,7 +102,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL debug_report_DestroyDebugReportCallback( VkLayerDbgFunctionNode *pTrav = inst->DbgFunctionHead; VkLayerDbgFunctionNode *pPrev = pTrav; - VkResult result = inst->disp->DestroyDebugReportCallbackLUNARG(instance, callback, pAllocator); + inst->disp->DestroyDebugReportCallbackLUNARG(instance, callback, pAllocator); while (pTrav) { if (pTrav->msgCallback == callback) { @@ -117,7 +117,6 @@ static VKAPI_ATTR VkResult VKAPI_CALL debug_report_DestroyDebugReportCallback( } loader_platform_thread_unlock_mutex(&loader_lock); - return result; } @@ -191,13 +190,12 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( * This is the instance chain terminator function * for DestroyDebugReportCallback */ -VKAPI_ATTR VkResult VKAPI_CALL loader_DestroyDebugReportCallback(VkInstance instance, +VKAPI_ATTR void loader_DestroyDebugReportCallback(VkInstance instance, VkDebugReportCallbackLUNARG callback, const VkAllocationCallbacks *pAllocator) { uint32_t storage_idx; VkDebugReportCallbackLUNARG *icd_info; const struct loader_icd *icd; - VkResult res = VK_SUCCESS; struct loader_instance *inst; for (inst = loader.instances; inst; inst = inst->next) { @@ -216,7 +214,6 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DestroyDebugReportCallback(VkInstance inst } storage_idx++; } - return res; } bool debug_report_instance_gpa( diff --git a/loader/debug_report.h b/loader/debug_report.h index 82100214..481cbd46 100644 --- a/loader/debug_report.h +++ b/loader/debug_report.h @@ -108,7 +108,7 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackLUNARG *pCallback); -VKAPI_ATTR VkResult VKAPI_CALL loader_DestroyDebugReportCallback( +VKAPI_ATTR void VKAPI_CALL loader_DestroyDebugReportCallback( VkInstance instance, VkDebugReportCallbackLUNARG callback, const VkAllocationCallbacks *pAllocator); |