intel: Use _brw suffix for genX headers that rely on brw

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>

src/gallium/drivers/iris/iris_blorp.c

@@ -47,7 +47,7 @@
 #include "genxml/gen_macros.h"
 
 #if GFX_VER >= 9
-#include "blorp/blorp_genX_exec.h"
+#include "blorp/blorp_genX_exec_brw.h"
 #else
 #include "blorp/blorp_genX_exec_elk.h"
 #endif

src/gallium/drivers/iris/iris_indirect_gen.c

@@ -35,7 +35,7 @@
 
 #if GFX_VER >= 9
 #include "intel/compiler/brw_compiler.h"
-#include "intel/common/intel_genX_state.h"
+#include "intel/common/intel_genX_state_brw.h"
 #else
 #include "intel/compiler/elk/elk_compiler.h"
 #include "intel/common/intel_genX_state_elk.h"

src/gallium/drivers/iris/iris_state.c

@@ -110,7 +110,7 @@
 
 #if GFX_VER >= 9
 #include "intel/compiler/brw_compiler.h"
-#include "intel/common/intel_genX_state.h"
+#include "intel/common/intel_genX_state_brw.h"
 #else
 #include "intel/compiler/elk/elk_compiler.h"
 #include "intel/common/intel_genX_state_elk.h"

src/intel/blorp/blorp_genX_exec_brw.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BLORP_GENX_EXEC_H
-#define BLORP_GENX_EXEC_H
+#ifndef BLORP_GENX_EXEC_BRW_H
+#define BLORP_GENX_EXEC_BRW_H
 
 #include "blorp_priv.h"
 #include "dev/intel_device_info.h"
@@ -166,7 +166,7 @@ _blorp_combine_address(struct blorp_batch *batch, void *location,
 #define __gen_combine_address _blorp_combine_address
 
 #include "genxml/genX_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #define _blorp_cmd_length(cmd) cmd ## _length
 #define _blorp_cmd_length_bias(cmd) cmd ## _length_bias
@@ -2706,4 +2706,4 @@ blorp_exec(struct blorp_batch *batch, const struct blorp_params *params)
    }
 }
 
-#endif /* BLORP_GENX_EXEC_H */
+#endif /* BLORP_GENX_EXEC_BRW_H */

src/intel/blorp/meson.build

@@ -28,7 +28,7 @@ files_libblorp = files(
 )
 
 files_blorp_brw = files(
-  'blorp_genX_exec.h',
+  'blorp_genX_exec_brw.h',
   'blorp_brw.c',
 )
 

src/intel/common/intel_genX_state_brw.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef INTEL_GENX_STATE_H
-#define INTEL_GENX_STATE_H
+#ifndef INTEL_GENX_STATE_BRW_H
+#define INTEL_GENX_STATE_BRW_H
 
 #ifndef GFX_VERx10
 #error This file should only be included by genX files.
@@ -182,4 +182,4 @@ preferred_slm_allocation_size(const struct intel_device_info *devinfo)
 }
 #endif
 
-#endif /* INTEL_GENX_STATE_H */
+#endif /* INTEL_GENX_STATE_BRW_H */

src/intel/common/meson.build

@@ -40,7 +40,7 @@ files_libintel_common = files(
   'intel_engine.h',
   'intel_gem.c',
   'intel_gem.h',
-  'intel_genX_state.h',
+  'intel_genX_state_brw.h',
   'intel_genX_state_elk.h',
   'intel_guardband.h',
   'intel_l3_config.c',

src/intel/vulkan/genX_blorp_exec.c

@@ -26,13 +26,13 @@
 #include "anv_private.h"
 #include "anv_measure.h"
 
-/* These are defined in anv_private.h and blorp_genX_exec.h */
+/* These are defined in anv_private.h and blorp_genX_exec_brw.h */
 #undef __gen_address_type
 #undef __gen_user_data
 #undef __gen_combine_address
 
 #include "common/intel_l3_config.h"
-#include "blorp/blorp_genX_exec.h"
+#include "blorp/blorp_genX_exec_brw.h"
 
 #include "ds/intel_tracepoints.h"
 

src/intel/vulkan/genX_cmd_buffer.c

@@ -33,7 +33,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "ds/intel_tracepoints.h"
 

src/intel/vulkan/genX_cmd_compute.c

@@ -33,7 +33,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "ds/intel_tracepoints.h"
 

src/intel/vulkan/genX_cmd_draw.c

@@ -33,7 +33,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "ds/intel_tracepoints.h"
 

src/intel/vulkan/genX_cmd_draw_generated_flush.h

@@ -29,7 +29,7 @@
 
 #include "util/macros.h"
 
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "anv_private.h"
 

src/intel/vulkan/genX_cmd_draw_generated_indirect.h

@@ -29,7 +29,7 @@
 
 #include "util/macros.h"
 
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "anv_private.h"
 #include "anv_internal_kernels.h"

src/intel/vulkan/genX_pipeline.c

@@ -27,7 +27,7 @@
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
 
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 #include "common/intel_l3_config.h"
 #include "common/intel_sample_positions.h"
 #include "nir/nir_xfb_info.h"

src/intel/vulkan/genX_simple_shader.c

@@ -30,7 +30,7 @@
 
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 static void
 genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state)
@@ -52,7 +52,7 @@ genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state)
     *
     * Find more about how to set up a 3D pipeline with a fragment shader but
     * without a vertex shader in blorp_emit_vertex_elements() in
-    * blorp_genX_exec.h.
+    * blorp_genX_exec_brw.h.
     */
    GENX(VERTEX_ELEMENT_STATE_pack)(
       batch, dw + 1, &(struct GENX(VERTEX_ELEMENT_STATE)) {

src/intel/vulkan_hasvk/genX_blorp_exec.c

@@ -26,7 +26,7 @@
 #include "anv_private.h"
 #include "anv_measure.h"
 
-/* These are defined in anv_private.h and blorp_genX_exec.h */
+/* These are defined in anv_private.h and blorp_genX_exec_elk.h */
 #undef __gen_address_type
 #undef __gen_user_data
 #undef __gen_combine_address