Skip to content

Commit 9ba2b21

Browse files
committed
VK: Show VkResult as decimal to match vulkan.h.
1 parent b77e4c7 commit 9ba2b21

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/renderer_vk.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -894,8 +894,6 @@ VK_IMPORT_DEVICE
894894
VKENUM(VK_INCOMPLETE);
895895
VKENUM(VK_ERROR_OUT_OF_HOST_MEMORY);
896896
VKENUM(VK_ERROR_OUT_OF_DEVICE_MEMORY);
897-
VKENUM(VK_ERROR_OUT_OF_POOL_MEMORY);
898-
VKENUM(VK_ERROR_FRAGMENTED_POOL);
899897
VKENUM(VK_ERROR_INITIALIZATION_FAILED);
900898
VKENUM(VK_ERROR_DEVICE_LOST);
901899
VKENUM(VK_ERROR_MEMORY_MAP_FAILED);
@@ -905,12 +903,20 @@ VK_IMPORT_DEVICE
905903
VKENUM(VK_ERROR_INCOMPATIBLE_DRIVER);
906904
VKENUM(VK_ERROR_TOO_MANY_OBJECTS);
907905
VKENUM(VK_ERROR_FORMAT_NOT_SUPPORTED);
906+
VKENUM(VK_ERROR_FRAGMENTED_POOL);
907+
VKENUM(VK_ERROR_UNKNOWN);
908+
VKENUM(VK_ERROR_VALIDATION_FAILED);
909+
VKENUM(VK_ERROR_OUT_OF_POOL_MEMORY);
910+
VKENUM(VK_ERROR_INVALID_EXTERNAL_HANDLE);
911+
VKENUM(VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS);
912+
VKENUM(VK_ERROR_FRAGMENTATION);
913+
VKENUM(VK_PIPELINE_COMPILE_REQUIRED);
914+
VKENUM(VK_ERROR_NOT_PERMITTED);
908915
VKENUM(VK_ERROR_SURFACE_LOST_KHR);
909916
VKENUM(VK_ERROR_NATIVE_WINDOW_IN_USE_KHR);
910917
VKENUM(VK_SUBOPTIMAL_KHR);
911918
VKENUM(VK_ERROR_OUT_OF_DATE_KHR);
912919
VKENUM(VK_ERROR_INCOMPATIBLE_DISPLAY_KHR);
913-
VKENUM(VK_ERROR_VALIDATION_FAILED_EXT);
914920
#undef VKENUM
915921
default: break;
916922
}

src/renderer_vk.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,11 @@
245245
VK_DESTROY_FUNC(ShaderModule); \
246246
VK_DESTROY_FUNC(SwapchainKHR); \
247247

248-
#define _VK_CHECK(_check, _call) \
249-
BX_MACRO_BLOCK_BEGIN \
250-
/*BX_TRACE(#_call);*/ \
251-
VkResult vkresult = _call; \
252-
_check(VK_SUCCESS == vkresult, #_call "; VK error 0x%x: %s", vkresult, getName(vkresult) ); \
248+
#define _VK_CHECK(_check, _call) \
249+
BX_MACRO_BLOCK_BEGIN \
250+
/*BX_TRACE(#_call);*/ \
251+
VkResult vkresult = _call; \
252+
_check(VK_SUCCESS == vkresult, #_call "; VK error %d: %s", vkresult, getName(vkresult) ); \
253253
BX_MACRO_BLOCK_END
254254

255255
#if BGFX_CONFIG_DEBUG

0 commit comments

Comments
 (0)