panfrost: Stop including midgard_pack.h directly

Include gen_macros.h instead so we can smoothly transition to per-gen
XMLs.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12551>

src/gallium/drivers/panfrost/pan_cmdstream.c

@@ -47,8 +47,6 @@
 #include "pan_indirect_dispatch.h"
 #include "pan_blitter.h"
 
-#include "midgard_pack.h"
-
 /* Statically assert that PIPE_* enums match the hardware enums.
  * (As long as they match, we don't need to translate them.)
  */

src/panfrost/lib/decode.c

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include <midgard_pack.h>
+#include <gen_macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>

src/panfrost/lib/pan_blend.c

@@ -32,10 +32,7 @@
 #include "compiler/nir/nir_conversion_builder.h"
 #include "compiler/nir/nir_lower_blend.h"
 
-/* Blending is shared across all supported Malis with only minor differences,
+#include <gen_macros.h>
- * so pin a particular version */
-#define ARCH 7
-#include <midgard_pack.h>
 
 /* Fixed function blending */
 

src/panfrost/lib/pan_device.h

@@ -41,7 +41,7 @@
 #include "pan_pool.h"
 #include "pan_util.h"
 
-#include <midgard_pack.h>
+#include <gen_macros.h>
 
 #if defined(__cplusplus)
 extern "C" {

src/panfrost/lib/pan_encoder.h

@@ -30,7 +30,7 @@
 #include <stdbool.h>
 #include "util/format/u_format.h"
 #include "pan_bo.h"
-#include "midgard_pack.h"
+#include "gen_macros.h"
 
 /* Indices for named (non-XFB) varyings that are present. These are packed
  * tightly so they correspond to a bitfield present (P) indexed by (1 <<

src/panfrost/lib/pan_format.c

@@ -25,7 +25,6 @@
  */
 
 #include "gen_macros.h"
-#include "midgard_pack.h"
 #include "pan_format.h"
 #include "util/format/u_format.h"
 

src/panfrost/lib/pan_pool.h

@@ -26,7 +26,7 @@
 #define __PAN_POOL_H__
 
 #include <stddef.h>
-#include <midgard_pack.h>
+#include <gen_macros.h>
 #include "pan_bo.h"
 
 #include "util/u_dynarray.h"

src/panfrost/lib/pan_scoreboard.h

@@ -27,7 +27,7 @@
 #ifndef __PAN_SCOREBOARD_H__
 #define __PAN_SCOREBOARD_H__
 
-#include "midgard_pack.h"
+#include "gen_macros.h"
 #include "pan_pool.h"
 
 struct pan_scoreboard {

src/panfrost/lib/pan_shader.h

@@ -29,7 +29,7 @@
 #include "panfrost/util/pan_ir.h"
 
 #include "pan_device.h"
-#include "midgard_pack.h"
+#include "gen_macros.h"
 
 struct panfrost_device;
 

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 "midgard_pack.h"
+#include "gen_macros.h"
 #include "pan_bo.h"
 #include "pan_device.h"
 #include "pan_util.h"

src/panfrost/vulkan/panvk_descriptor_set.c

@@ -37,7 +37,7 @@
 #include "vk_util.h"
 
 #include "pan_bo.h"
-#include "midgard_pack.h"
+#include "gen_macros.h"
 
 VkResult
 panvk_CreateDescriptorSetLayout(VkDevice _device,

src/panfrost/vulkan/panvk_varyings.h

@@ -28,7 +28,7 @@
 #include "util/format/u_format.h"
 
 #include "compiler/shader_enums.h"
-#include "midgard_pack.h"
+#include "gen_macros.h"
 #include "panfrost-job.h"
 
 struct pan_pool;