Allow null dispatchable objects

Because we need to dereference dispatchable objects in order to get the underlying object, we need to first check for VK_NULL_HANDLE to avoid crashing. Bug b/116336664 Change-Id: Ia903dcc6142d5e7f283da8fbef0f43bae3ca243f Tests: dEQP-VK.api.null_handle.free_command_buffers Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27388Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Allow null dispatchable objects
1cef4e69 · Alexis Hetu · Alexis Hétu · 036614c8 · 1cef4e69
Commit 1cef4e69 authored Mar 15, 2019 by Alexis Hetu Committed by Alexis Hétu Mar 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

VkObject.hpp src/Vulkan/VkObject.hpp +2 -1

No files found.
--- a/src/Vulkan/VkObject.hpp
+++ b/src/Vulkan/VkObject.hpp
@@ -144,7 +144,8 @@ public:

 	static inline T* Cast(VkT vkObject)
 	{
-		return &(reinterpret_cast<DispatchableObject<T, VkT>*>(vkObject)->object);
+		return (vkObject == VK_NULL_HANDLE) ? nullptr :
+		       &(reinterpret_cast<DispatchableObject<T, VkT>*>(vkObject)->object);
 	}

 	operator VkT()