OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: explicitly cast object-type enum

Browse Source 
VkObjectType and VkDebugReportObjectTypeEXT has the same enum-values.
Why the Vulkan WG thought this was a good idea, beats me. But it's what
we have to live with now.

Anyway, instead of having a statement that implicitly casts two
different values from the former to the latter, let's fully relsove the
type as the former, and cast the value when using it instead.

Fixes: 41318a5819 ("vulkan: Use vk_object_base::type for debug_report")
Acked-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15547>
This commit is contained in:
Erik Faye-Lund
2022-03-24 09:57:10 +01:00
committed by Marge Bot
parent 90db834603
commit b27a2ba4fc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vulkan/runtime/vk_debug_report.c
View File

@@ -150,8 +150,9 @@ vk_debug_report(struct vk_instance *instance,
const char* pLayerPrefix, const char* pLayerPrefix,
const char *pMessage) const char *pMessage)
{ {
VkDebugReportObjectTypeEXT object_type = VkObjectType object_type =
object ? object->type : VK_OBJECT_TYPE_UNKNOWN; object ? object->type : VK_OBJECT_TYPE_UNKNOWN;
debug_report(instance, flags, object_type, (uint64_t)(uintptr_t)object, debug_report(instance, flags, (VkDebugReportObjectTypeEXT)object_type,
location, messageCode, pLayerPrefix, pMessage); (uint64_t)(uintptr_t)object, location, messageCode,
pLayerPrefix, pMessage);
} }