panfrost: Redirect cmdstream includes through GenXML

This will provide a way to incrementally upgrade.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6195>

diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.h b/src/gallium/drivers/panfrost/pan_blend_shaders.h
index 5931cbc41ce67ab8d460ee63ae1fb33558a076e2..cd3237684e2fdf229f9ed3ee1e9b7e0a9f663dc6 100644 (file)
--- 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 <panfrost-job.h>
+#include <midgard_pack.h>
 #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 5eee0bbdfc914119db1f1cf3d2bcdc276ffd24bb..4ceaf16f1de7f3b6588ce70f9268d8b308e83caf 100644 (file)
--- 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 <panfrost-job.h>
+#include <midgard_pack.h>
 
 struct panfrost_blend_state;
 

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.h b/src/gallium/drivers/panfrost/pan_cmdstream.h
index 908aa1f6b9ecaa6b0e23015c718aac95e896f64a..067542d3c6c96e8c745f581c648bd86c647f8c0d 100644 (file)
--- 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 60970cb44f921161ff1330265f99f57852cfda08..12f1dd8f270abc10f534ba3335a4c135cfb5ab16 100644 (file)
--- 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 <panfrost-job.h>
+#include <midgard_pack.h>
 #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 74d988a90eedae79d107afbf83162eac4f5dbfda..9f6c94ca2b911895b4042a13e25ab382c37e3579 100644 (file)
--- 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 f3ce25e55fbb5a858cf857b9d752df355f47ad54..d3b68f29fa900a7895fc091bb690505d6b99bf17 100644 (file)
--- a/src/panfrost/lib/decode.c
+++ b/src/panfrost/lib/decode.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include <panfrost-job.h>
+#include <midgard_pack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>

diff --git a/src/panfrost/lib/pan_attributes.c b/src/panfrost/lib/pan_attributes.c
index d0d79486185a9fcab1971a40627148bf003bbd16..f12ff159645c308ec272e5cbfd1b458721ad94b0 100644 (file)
--- 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 b84c8e7cdaeec84281eb5882e9a5ce63437545cd..b1996d0a6451d41a206eea05d0cc038f84c491a0 100644 (file)
--- 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 <panfrost-job.h>
+#include <midgard_pack.h>
 
 /* 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 42ec8320acbb33bd3f2b302e20014cb0278459d2..fbef6734e17145705e597d2d240a8da2e1e6c9a2 100644 (file)
--- a/src/panfrost/lib/pan_encoder.h
+++ b/src/panfrost/lib/pan_encoder.h
@@ -28,7 +28,7 @@
 #define __PAN_ENCODER_H
 
 #include <stdbool.h>
-#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 76006164a36198a4e59afc4e17077e281af02779..24e32a41fc88c84b7d76fff2e59ca4d14da9ef85 100644 (file)
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -25,7 +25,7 @@
  */
 
 #include <stdio.h>
-#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 14593eabd4380f08c6277fd75a8fdededb0c310b..c4668af57feec72d75312c4d73aaafeb20e0b44d 100644 (file)
--- a/src/panfrost/lib/pan_pool.h
+++ b/src/panfrost/lib/pan_pool.h
@@ -26,7 +26,7 @@
 #define __PAN_POOL_H__
 
 #include <stddef.h>
-#include <panfrost-job.h>
+#include <midgard_pack.h>
 
 /* 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 71667d4b5de707ffa09d93a202d56480a41e1a94..dcf12410ede417aaecc7ebf12cc2e4ee9bc7c97e 100644 (file)
--- 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 fa3918f0f2ee9c2a89c24586bbfdd9d6aa984fca..196c7b5e6bba6e6f2ce100057791bd873aaf8db5 100644 (file)
--- 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