From 58823f054e58c643747aefdbedaeb7fc6906b2e2 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 9 Aug 2022 07:42:43 -0400
Subject: [PATCH] zink: make zink_bo.h compile in c++

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 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h
index 03aabbcead6..9248e5d9dca 100644
--- a/src/gallium/drivers/zink/zink_bo.h
+++ b/src/gallium/drivers/zink/zink_bo.h
@@ -36,21 +36,20 @@
 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: