From d32512effc7e0c7824130290972507ef64f3f88b Mon Sep 17 00:00:00 2001
From: James Park <jpark37@lagfreegames.com>
Date: Sat, 10 Apr 2021 21:31:19 -0700
Subject: [PATCH] vulkan/util: Use util_bitcount

__builtin_popcount is not available on all compilers.

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10159>
---
 src/vulkan/util/vk_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vulkan/util/vk_util.h b/src/vulkan/util/vk_util.h
index b4c82052e15..946d92231bb 100644
--- a/src/vulkan/util/vk_util.h
+++ b/src/vulkan/util/vk_util.h
@@ -245,7 +245,7 @@ struct vk_pipeline_cache_header {
 static inline gl_shader_stage
 vk_to_mesa_shader_stage(VkShaderStageFlagBits vk_stage)
 {
-   assert(__builtin_popcount((uint32_t) vk_stage) == 1);
+   assert(util_bitcount((uint32_t) vk_stage) == 1);
    return (gl_shader_stage) (ffs((uint32_t) vk_stage) - 1);
 }