From 88dc4c21e6cd3084212a5d780c4113ee02721f14 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 5 Aug 2020 18:13:11 -0400 Subject: [PATCH] panfrost: Redirect cmdstream includes through GenXML This will provide a way to incrementally upgrade. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- src/gallium/drivers/panfrost/pan_blend_shaders.h | 2 +- src/gallium/drivers/panfrost/pan_blending.h | 2 +- src/gallium/drivers/panfrost/pan_cmdstream.h | 2 +- src/gallium/drivers/panfrost/pan_resource.h | 2 +- src/panfrost/bifrost/test/bit.h | 2 +- src/panfrost/lib/decode.c | 2 +- src/panfrost/lib/pan_attributes.c | 2 +- src/panfrost/lib/pan_device.h | 2 +- src/panfrost/lib/pan_encoder.h | 2 +- src/panfrost/lib/pan_format.c | 2 +- src/panfrost/lib/pan_pool.h | 2 +- src/panfrost/lib/pan_scoreboard.h | 2 +- src/panfrost/lib/pan_texture.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.h b/src/gallium/drivers/panfrost/pan_blend_shaders.h index 5931cbc41ce..cd3237684e2 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.h +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.h @@ -27,7 +27,7 @@ #include "pipe/p_state.h" #include "pipe/p_defines.h" -#include +#include #include "pan_context.h" #include "pan_blend.h" diff --git a/src/gallium/drivers/panfrost/pan_blending.h b/src/gallium/drivers/panfrost/pan_blending.h index 5eee0bbdfc9..4ceaf16f1de 100644 --- a/src/gallium/drivers/panfrost/pan_blending.h +++ b/src/gallium/drivers/panfrost/pan_blending.h @@ -27,7 +27,7 @@ #include "pipe/p_state.h" #include "pipe/p_defines.h" -#include +#include struct panfrost_blend_state; diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.h b/src/gallium/drivers/panfrost/pan_cmdstream.h index 908aa1f6b9e..067542d3c6c 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.h +++ b/src/gallium/drivers/panfrost/pan_cmdstream.h @@ -28,7 +28,7 @@ #include "pipe/p_defines.h" #include "pipe/p_state.h" -#include "panfrost-job.h" +#include "midgard_pack.h" #include "pan_job.h" diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h index 60970cb44f9..12f1dd8f270 100644 --- a/src/gallium/drivers/panfrost/pan_resource.h +++ b/src/gallium/drivers/panfrost/pan_resource.h @@ -26,7 +26,7 @@ #ifndef PAN_RESOURCE_H #define PAN_RESOURCE_H -#include +#include #include "pan_screen.h" #include "pan_pool.h" #include "pan_minmax_cache.h" diff --git a/src/panfrost/bifrost/test/bit.h b/src/panfrost/bifrost/test/bit.h index 74d988a90ee..9f6c94ca2b9 100644 --- a/src/panfrost/bifrost/test/bit.h +++ b/src/panfrost/bifrost/test/bit.h @@ -27,7 +27,7 @@ #ifndef __BIFROST_TEST_H #define __BIFROST_TEST_H -#include "panfrost/include/panfrost-job.h" +#include "panfrost/lib/midgard_pack.h" #include "panfrost/lib/pan_device.h" #include "panfrost/lib/pan_bo.h" #include "bifrost_compile.h" diff --git a/src/panfrost/lib/decode.c b/src/panfrost/lib/decode.c index f3ce25e55fb..d3b68f29fa9 100644 --- a/src/panfrost/lib/decode.c +++ b/src/panfrost/lib/decode.c @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #include #include #include diff --git a/src/panfrost/lib/pan_attributes.c b/src/panfrost/lib/pan_attributes.c index d0d79486185..f12ff159645 100644 --- a/src/panfrost/lib/pan_attributes.c +++ b/src/panfrost/lib/pan_attributes.c @@ -23,7 +23,7 @@ */ #include "util/u_math.h" -#include "panfrost-job.h" +#include "midgard_pack.h" #include "pan_encoder.h" /* This file handles attribute descriptors (mali_attr_meta). The diff --git a/src/panfrost/lib/pan_device.h b/src/panfrost/lib/pan_device.h index b84c8e7cdae..b1996d0a645 100644 --- a/src/panfrost/lib/pan_device.h +++ b/src/panfrost/lib/pan_device.h @@ -37,7 +37,7 @@ #include "util/list.h" #include "util/sparse_array.h" -#include +#include /* Driver limits */ #define PAN_MAX_CONST_BUFFERS 16 diff --git a/src/panfrost/lib/pan_encoder.h b/src/panfrost/lib/pan_encoder.h index 42ec8320acb..fbef6734e17 100644 --- a/src/panfrost/lib/pan_encoder.h +++ b/src/panfrost/lib/pan_encoder.h @@ -28,7 +28,7 @@ #define __PAN_ENCODER_H #include -#include "panfrost-job.h" +#include "midgard_pack.h" /* Invocation packing */ diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c index 76006164a36..24e32a41fc8 100644 --- a/src/panfrost/lib/pan_format.c +++ b/src/panfrost/lib/pan_format.c @@ -25,7 +25,7 @@ */ #include -#include "panfrost-job.h" +#include "midgard_pack.h" #include "pan_texture.h" /* Convenience */ diff --git a/src/panfrost/lib/pan_pool.h b/src/panfrost/lib/pan_pool.h index 14593eabd43..c4668af57fe 100644 --- a/src/panfrost/lib/pan_pool.h +++ b/src/panfrost/lib/pan_pool.h @@ -26,7 +26,7 @@ #define __PAN_POOL_H__ #include -#include +#include /* Represents a pool of memory that can only grow, used to allocate objects * with the same lifetime as the pool itself. In OpenGL, a pool is owned by the diff --git a/src/panfrost/lib/pan_scoreboard.h b/src/panfrost/lib/pan_scoreboard.h index 71667d4b5de..dcf12410ede 100644 --- a/src/panfrost/lib/pan_scoreboard.h +++ b/src/panfrost/lib/pan_scoreboard.h @@ -27,7 +27,7 @@ #ifndef __PAN_SCOREBOARD_H__ #define __PAN_SCOREBOARD_H__ -#include "panfrost-job.h" +#include "midgard_pack.h" #include "pan_pool.h" struct pan_scoreboard { diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h index fa3918f0f2e..196c7b5e6bb 100644 --- a/src/panfrost/lib/pan_texture.h +++ b/src/panfrost/lib/pan_texture.h @@ -32,7 +32,7 @@ #include "drm-uapi/drm_fourcc.h" #include "util/format/u_format.h" #include "compiler/shader_enums.h" -#include "panfrost-job.h" +#include "midgard_pack.h" #include "pan_bo.h" #define PAN_MODIFIER_COUNT 4 -- 2.30.2