Module: Mesa Branch: main Commit: 238a9ef5ff473d8ccb9c3ce4878277b0fec09250 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=238a9ef5ff473d8ccb9c3ce4878277b0fec09250
Author: Yonggang Luo <[email protected]> Date: Sun Dec 10 00:46:51 2023 +0800 broadcom/(compiler,common): avoid include of gallium headers in header files Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Alejandro Piñeiro <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26579> --- src/broadcom/common/v3d_tiling.c | 1 + src/broadcom/common/v3d_tiling.h | 4 +++- src/broadcom/compiler/v3d_compiler.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/broadcom/common/v3d_tiling.c b/src/broadcom/common/v3d_tiling.c index 22f84811e19..5c3e67340f0 100644 --- a/src/broadcom/common/v3d_tiling.c +++ b/src/broadcom/common/v3d_tiling.c @@ -28,6 +28,7 @@ */ #include <stdint.h> +#include "util/u_box.h" /* FIXME: avoid include this */ #include "v3d_tiling.h" #include "broadcom/common/v3d_cpu_tiling.h" diff --git a/src/broadcom/common/v3d_tiling.h b/src/broadcom/common/v3d_tiling.h index 08ae7cce805..2573c8a5f02 100644 --- a/src/broadcom/common/v3d_tiling.h +++ b/src/broadcom/common/v3d_tiling.h @@ -24,7 +24,7 @@ #ifndef V3D_TILING_H #define V3D_TILING_H -#include "util/u_box.h" +#include "util/format/u_format.h" /* A UIFblock is a 256-byte region of memory that's 256-byte aligned. These * will be grouped in 4x4 blocks (left-to-right, then top-to-bottom) in a 4KB @@ -63,6 +63,8 @@ enum v3d_tiling_mode { V3D_TILING_UIF_XOR, }; +struct pipe_box; + uint32_t v3d_utile_width(int cpp) ATTRIBUTE_CONST; uint32_t v3d_utile_height(int cpp) ATTRIBUTE_CONST; bool v3d_size_is_lt(uint32_t width, uint32_t height, int cpp) ATTRIBUTE_CONST; diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h index 09cde61cb46..5ee00eb6487 100644 --- a/src/broadcom/compiler/v3d_compiler.h +++ b/src/broadcom/compiler/v3d_compiler.h @@ -41,7 +41,6 @@ #include "util/u_math.h" #include "qpu/qpu_instr.h" -#include "pipe/p_state.h" /** * Maximum number of outstanding TMU operations we can queue for execution.
