From 0642708fe8c14a81827a92a4f05b669f3c1f0726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Tue, 4 Feb 2025 09:53:18 -0800 Subject: [PATCH] gallium: Remove pb_buffer.h include from pb_slab.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pb_slab.h don't make use of anything defined in pb_buffer.h. But removing it breaks Iris build because pb_buffer.h then includes util/format/u_formats.h that Iris was using but not including. Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: --- src/gallium/auxiliary/pipebuffer/pb_slab.h | 1 - src/gallium/drivers/iris/iris_bufmgr.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/pipebuffer/pb_slab.h b/src/gallium/auxiliary/pipebuffer/pb_slab.h index 885483e4415..7ef7c5ddc23 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_slab.h +++ b/src/gallium/auxiliary/pipebuffer/pb_slab.h @@ -44,7 +44,6 @@ #ifndef PB_SLAB_H #define PB_SLAB_H -#include "pb_buffer.h" #include "util/simple_mtx.h" #include "util/list.h" #include "util/u_thread.h" diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h index 6b767e8191b..dba2caf2b2c 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.h +++ b/src/gallium/drivers/iris/iris_bufmgr.h @@ -31,6 +31,7 @@ #include "c11/threads.h" #include "common/intel_bind_timeline.h" +#include "util/format/u_formats.h" #include "util/macros.h" #include "util/u_atomic.h" #include "util/u_dynarray.h"