From 0c12a3968257b0ea5144bf6c7ffe68d2f4158d29 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Sat, 5 Nov 2022 19:25:13 +0800
Subject: [PATCH] mesa: include <util/*.h> instead macros.h in
 texcompress_bptc_tmp.h

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19547>
---
 src/mesa/main/texcompress_bptc_tmp.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/texcompress_bptc_tmp.h b/src/mesa/main/texcompress_bptc_tmp.h
index e5deac2f0d1..dae6a57de84 100644
--- a/src/mesa/main/texcompress_bptc_tmp.h
+++ b/src/mesa/main/texcompress_bptc_tmp.h
@@ -28,9 +28,10 @@
 #ifndef TEXCOMPRESS_BPTC_TMP_H
 #define TEXCOMPRESS_BPTC_TMP_H
 
+#include "util/bitscan.h"
 #include "util/format_srgb.h"
 #include "util/half_float.h"
-#include "macros.h"
+#include "util/u_math.h"
 
 #define BLOCK_SIZE 4
 #define N_PARTITIONS 64