Mesa (master): radv: remove radv_util.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 64ed8734059af1d3e7e1e4ce0e8e194ab097d3fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=64ed8734059af1d3e7e1e4ce0e8e194ab097d3fa

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jan 19 18:32:00 2021 +0100

radv: remove radv_util.h

util_bitcount() is already defined in src/util/bitscan.h.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8711>

---

 src/amd/vulkan/Makefile.sources |  1 -
 src/amd/vulkan/meson.build      |  1 -
 src/amd/vulkan/radv_util.h      | 11 -----------
 src/amd/vulkan/si_cmd_buffer.c  |  1 -
 4 files changed, 14 deletions(-)

diff --git a/src/amd/vulkan/Makefile.sources b/src/amd/vulkan/Makefile.sources
index 4b03b2007a3..2f790a9bac9 100644
--- a/src/amd/vulkan/Makefile.sources
+++ b/src/amd/vulkan/Makefile.sources
@@ -83,7 +83,6 @@ VULKAN_FILES := \
 	radv_sqtt.c \
 	radv_query.c \
 	radv_util.c \
-	radv_util.h \
 	radv_wsi.c \
 	si_cmd_buffer.c \
 	vk_format.h \
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 74c0148e88e..de09ba5d598 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -97,7 +97,6 @@ libradv_files = files(
   'radv_sqtt.c',
   'radv_query.c',
   'radv_util.c',
-  'radv_util.h',
   'radv_wsi.c',
   'si_cmd_buffer.c',
   'vk_format.h',
diff --git a/src/amd/vulkan/radv_util.h b/src/amd/vulkan/radv_util.h
deleted file mode 100644
index 2b004889214..00000000000
--- a/src/amd/vulkan/radv_util.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef RADV_UTIL_H
-#define RADV_UTIL_H
-
-#ifdef HAVE___BUILTIN_POPCOUNT
-#define util_bitcount(i) __builtin_popcount(i)
-#else
-extern unsigned int
-util_bitcount(unsigned int n);
-#endif
-
-#endif /* RADV_UTIL_H */
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 591fc15f9b9..fc613fe01b7 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -31,7 +31,6 @@
 #include "radv_shader.h"
 #include "radv_cs.h"
 #include "sid.h"
-#include "radv_util.h"
 
 static void
 si_write_harvested_raster_configs(struct radv_physical_device *physical_device,