zink: make zink_bo.h compile in c++
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 9 Aug 2022 11:42:43 +0000 (07:42 -0400)
committerMarge Bot <emma+marge@anholt.net>
Sat, 20 Aug 2022 01:27:13 +0000 (01:27 +0000)
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18135>

src/gallium/drivers/zink/zink_bo.h

index 03aabbc..9248e5d 100644 (file)
 static inline enum zink_alloc_flag
 zink_alloc_flags_from_heap(enum zink_heap heap)
 {
-   enum zink_alloc_flag flags = 0;
    switch (heap) {
    case ZINK_HEAP_DEVICE_LOCAL_SPARSE:
-      flags |= ZINK_ALLOC_SPARSE;
+      return ZINK_ALLOC_SPARSE;
       break;
    default:
       break;
    }
-   return flags;
+   return (enum zink_alloc_flag)0;
 }
 
 static inline VkMemoryPropertyFlags
 vk_domain_from_heap(enum zink_heap heap)
 {
-   VkMemoryPropertyFlags domains = 0;
+   VkMemoryPropertyFlags domains = (VkMemoryPropertyFlags)0;
 
    switch (heap) {
    case ZINK_HEAP_DEVICE_LOCAL: