intel/compiler,intel/blorp,intel/vulkan: decouple vulkan driver and compiler from gallium

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24438>

src/intel/blorp/meson.build

@@ -31,7 +31,7 @@ files_libblorp = files(
 libblorp = static_library(
   'blorp',
   [files_libblorp],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+  include_directories : [inc_include, inc_src, inc_intel],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   dependencies : [idep_nir_headers, idep_genxml, idep_mesautil, idep_intel_dev],

src/intel/common/meson.build

@@ -68,7 +68,7 @@ endif
 libintel_common = static_library(
   'intel_common',
   [files_libintel_common, genX_xml_h, sha1_h],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+  include_directories : [inc_include, inc_src, inc_intel],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   link_with : [libisl],

src/intel/compiler/brw_clip_line.c

@@ -29,10 +29,6 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "main/macros.h"
-#include "main/enums.h"
-#include "program/program.h"
-
 #include "brw_clip.h"
 #include "brw_prim.h"
 

src/intel/compiler/brw_clip_point.c

@@ -29,10 +29,6 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "main/macros.h"
-#include "main/enums.h"
-#include "program/program.h"
-
 #include "brw_clip.h"
 
 

src/intel/compiler/brw_clip_tri.c

@@ -29,10 +29,6 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "main/macros.h"
-#include "main/enums.h"
-#include "program/program.h"
-
 #include "brw_clip.h"
 #include "brw_prim.h"
 

src/intel/compiler/brw_clip_unfilled.c

@@ -29,10 +29,6 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "main/macros.h"
-#include "main/enums.h"
-#include "program/program.h"
-
 #include "brw_clip.h"
 #include "brw_prim.h"
 

src/intel/compiler/brw_clip_util.c

@@ -29,11 +29,6 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-
-#include "main/macros.h"
-#include "main/enums.h"
-#include "program/program.h"
-
 #include "brw_clip.h"
 
 

src/intel/compiler/brw_compiler.c

@@ -26,7 +26,6 @@
 #include "brw_eu.h"
 #include "dev/intel_debug.h"
 #include "compiler/nir/nir.h"
-#include "main/errors.h"
 #include "util/u_debug.h"
 
 #define COMMON_OPTIONS                                                        \

src/intel/compiler/brw_fs.cpp

@@ -28,7 +28,6 @@
  * from the LIR.
  */
 
-#include "main/macros.h"
 #include "brw_eu.h"
 #include "brw_fs.h"
 #include "brw_fs_live_variables.h"
@@ -41,7 +40,6 @@
 #include "dev/intel_wa.h"
 #include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"
-#include "program/prog_parameter.h"
 #include "util/u_math.h"
 
 #include <memory>

src/intel/compiler/brw_ir_allocator.h

@@ -25,7 +25,11 @@
 #ifndef BRW_IR_ALLOCATOR_H
 #define BRW_IR_ALLOCATOR_H
 
-#include "main/macros.h"
+#include "util/compiler.h"
+#include "util/glheader.h"
+#include "util/macros.h"
+#include "util/rounding.h"
+#include "util/u_math.h"
 
 namespace brw {
    /**

src/intel/compiler/brw_reg.h

@@ -44,8 +44,10 @@
 
 #include <stdbool.h>
 #include "util/compiler.h"
-#include "main/macros.h"
-#include "program/prog_instruction.h"
+#include "util/glheader.h"
+#include "util/macros.h"
+#include "util/rounding.h"
+#include "util/u_math.h"
 #include "brw_eu_defines.h"
 #include "brw_reg_type.h"
 

src/intel/compiler/brw_shader.cpp

@@ -28,7 +28,6 @@
 #include "brw_private.h"
 #include "brw_vec4_tes.h"
 #include "dev/intel_debug.h"
-#include "main/uniforms.h"
 #include "util/macros.h"
 
 enum brw_reg_type

src/intel/compiler/brw_vec4.cpp

@@ -30,7 +30,6 @@
 #include "brw_dead_control_flow.h"
 #include "brw_private.h"
 #include "dev/intel_debug.h"
-#include "program/prog_parameter.h"
 #include "util/u_math.h"
 
 #define MAX_INSTRUCTION (1 << 30)

src/intel/compiler/meson.build

@@ -160,7 +160,7 @@ brw_nir_trig = custom_target(
 libintel_compiler = static_library(
   'intel_compiler',
   [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+  include_directories : [inc_include, inc_src, inc_intel],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev],
@@ -175,7 +175,7 @@ if with_intel_clc
     link_with : [
       libintel_compiler, libintel_common,libisl,
     ],
-    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+    include_directories : [inc_include, inc_src, inc_intel],
     c_args : [pre_args, no_override_init_args],
     link_args : [ld_args_build_id],
     dependencies : [idep_nir, idep_vtn, idep_mesaclc, idep_mesautil, idep_intel_dev],
@@ -203,7 +203,7 @@ if with_tests
         'test_vf_float_conversions.cpp',
       ),
       ir_expression_operation_h,
-      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+      include_directories : [inc_include, inc_src, inc_intel],
       link_with : [
         libintel_compiler, libintel_common, libisl
       ],

src/intel/compiler/test_fs_cmod_propagation.cpp

@@ -24,7 +24,6 @@
 #include <gtest/gtest.h>
 #include "brw_fs.h"
 #include "brw_cfg.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_fs_copy_propagation.cpp

@@ -24,7 +24,6 @@
 #include <gtest/gtest.h>
 #include "brw_fs.h"
 #include "brw_cfg.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_fs_saturate_propagation.cpp

@@ -24,7 +24,6 @@
 #include <gtest/gtest.h>
 #include "brw_fs.h"
 #include "brw_cfg.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_fs_scoreboard.cpp

@@ -24,7 +24,6 @@
 #include <gtest/gtest.h>
 #include "brw_fs.h"
 #include "brw_cfg.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_vec4_cmod_propagation.cpp

@@ -27,7 +27,6 @@
 #include "brw_vec4.h"
 #include "brw_vec4_builder.h"
 #include "brw_cfg.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_vec4_copy_propagation.cpp

@@ -23,7 +23,6 @@
 
 #include <gtest/gtest.h>
 #include "brw_vec4.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_vec4_dead_code_eliminate.cpp

@@ -23,7 +23,6 @@
 
 #include <gtest/gtest.h>
 #include "brw_vec4.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/compiler/test_vec4_register_coalesce.cpp

@@ -23,7 +23,6 @@
 
 #include <gtest/gtest.h>
 #include "brw_vec4.h"
-#include "program/program.h"
 
 using namespace brw;
 

src/intel/ds/meson.build

@@ -30,13 +30,13 @@ endif
 
 idep_intel_driver_ds_headers = declare_dependency(
   sources : intel_tracepoint_files[0],
-  include_directories : [inc_include, inc_mapi, inc_mesa, inc_intel],
+  include_directories : [inc_include, inc_intel],
 )
 
 libintel_driver_ds = static_library(
   'intel-driver-ds',
   sources : ['intel_driver_ds.cc', intel_tracepoint_files],
-  include_directories : [inc_src, inc_include, inc_intel, inc_mapi, inc_mesa],
+  include_directories : [inc_src, inc_include, inc_intel],
   link_with : [libintel_perf, libintel_common],
   dependencies : [libintel_driver_ds_deps, idep_intel_dev],
   gnu_symbol_visibility : 'hidden',
@@ -44,7 +44,7 @@ libintel_driver_ds = static_library(
 
 idep_intel_driver_ds = declare_dependency(
   link_with : libintel_driver_ds,
-  include_directories : [inc_include, inc_mapi, inc_mesa, inc_intel],
+  include_directories : [inc_include, inc_intel],
   dependencies : idep_intel_driver_ds_headers,
 )
 

src/intel/isl/isl_format.c

@@ -28,12 +28,14 @@
 #include "dev/intel_device_info.h"
 
 #include "util/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
-#include "util/format_srgb.h"
-#include "util/format_rgb9e5.h"
-#include "util/format_r11g11b10f.h"
 
-/* Header-only format conversion include */
-#include "main/format_utils.h"
+#include "util/format/format_utils.h"
+#include "util/format_r11g11b10f.h"
+#include "util/format_rgb9e5.h"
+#include "util/format_srgb.h"
+#include "util/half_float.h"
+#include "util/rounding.h"
+#include "util/u_math.h"
 
 struct surface_format_info {
    bool exists;

src/intel/isl/meson.build

@@ -69,7 +69,7 @@ foreach g : [['40', isl_gfx4_files], ['50', []], ['60', isl_gfx6_files],
   isl_per_hw_ver_libs += static_library(
     'isl_per_hw_ver@0@'.format(_gfx_ver),
     [g[1], isl_per_hw_ver_files, gen_xml_pack],
-    include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+    include_directories : [inc_include, inc_src, inc_intel],
     dependencies : [idep_mesautil, idep_intel_dev],
     c_args : [
       no_override_init_args,
@@ -98,7 +98,7 @@ isl_tiled_memcpy = static_library(
   'isl_tiled_memcpy',
   [files_isl_tiled_memcpy],
   include_directories : [
-    inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
+    inc_include, inc_src, inc_intel,
   ],
 
   dependencies : [idep_mesautil, idep_intel_dev],
@@ -112,7 +112,7 @@ if with_sse41
     'isl_tiled_memcpy_sse41',
     [files_isl_tiled_memcpy_sse41],
     include_directories : [
-      inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
+      inc_include, inc_src, inc_intel,
     ],
     dependencies : [idep_mesautil, idep_intel_dev],
     link_args : ['-Wl,--exclude-libs=ALL'],
@@ -138,7 +138,7 @@ libisl_files = files(
 libisl = static_library(
   'isl',
   [libisl_files, isl_format_layout_c, genX_bits_h],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+  include_directories : [inc_include, inc_src, inc_intel],
   link_with : [isl_per_hw_ver_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
   dependencies : [idep_mesautil, idep_intel_dev],
   c_args : [no_override_init_args],
@@ -166,7 +166,7 @@ if with_tests
       'tests/isl_surf_get_image_offset_test.c',
       dependencies : [dep_m, idep_mesautil, idep_intel_dev],
       link_with:  libisl,
-      include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+      include_directories : [inc_include, inc_src, inc_intel],
     ),
     suite : ['intel'],
   )
@@ -179,7 +179,7 @@ if with_tests
         'isl_aux_info.c',
       ],
       dependencies : [dep_m, idep_gtest, idep_mesautil, idep_intel_dev],
-      include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+      include_directories : [inc_include, inc_src, inc_intel],
       c_args : '-DIN_UNIT_TEST',
       cpp_args : '-DIN_UNIT_TEST',
     ),

src/intel/tools/meson.build

@@ -55,7 +55,7 @@ i965_disasm = executable(
   'i965_disasm',
   files('i965_disasm.c'),
   dependencies : [idep_mesautil, dep_thread, idep_intel_dev],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_intel],
+  include_directories : [inc_include, inc_src, inc_intel],
   link_with : [libintel_common, libintel_compiler],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
@@ -190,7 +190,7 @@ i965_asm = executable(
   'i965_asm',
   ['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c],
   dependencies : [idep_mesautil, dep_thread, idep_intel_dev],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_intel],
+  include_directories : [inc_include, inc_src, inc_intel],
   link_with : [libintel_common, libintel_compiler],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',

src/intel/vulkan/anv_nir_apply_pipeline_layout.c

@@ -22,7 +22,6 @@
  */
 
 #include "anv_nir.h"
-#include "program/prog_parameter.h"
 #include "nir/nir_builder.h"
 #include "compiler/brw_nir.h"
 #include "util/mesa-sha1.h"

src/intel/vulkan/grl/meson.build

@@ -162,7 +162,7 @@ foreach t : [['125', 'gfx125', 'dg2']]
     [grl_cl_kernel_h, grl_compiled_cl_kernels, grl_cl_kernel_c,
      grl_genX_files, grl_metakernel_c, grl_metakernel_h],
     include_directories : [
-      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler,
+      inc_include, inc_src, inc_compiler,
       inc_intel,
     ],
     c_args : [
@@ -192,7 +192,7 @@ libgrl = static_library(
   'grl',
   [grl_cl_kernel_h],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel,
+    inc_include, inc_src, inc_intel,
     inc_compiler,
   ],
   link_whole : [grl_genX_libs],

src/intel/vulkan/meson.build

@@ -118,7 +118,7 @@ foreach g : [['90', ['gfx8_cmd_buffer.c']],
     'anv_per_hw_ver@0@'.format(_gfx_ver),
     [anv_per_hw_ver_files, g[1], anv_entrypoints[0], anv_internal_spvs, ],
     include_directories : [
-      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel,
+      inc_include, inc_src, inc_compiler, inc_intel,
     ],
     c_args : anv_flags + ['-DGFX_VERx10=@0@'.format(_gfx_ver)],
     gnu_symbol_visibility : 'hidden',
@@ -225,7 +225,7 @@ libanv_common = static_library(
     anv_internal_spvs,
   ],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel, inc_compiler,
     inc_util,
   ],
   c_args : anv_flags,
@@ -238,7 +238,7 @@ libvulkan_intel = shared_library(
   'vulkan_intel',
   [files('anv_gem.c'), anv_entrypoints[0]],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel, inc_compiler,
   ],
   link_whole : [libanv_common, libanv_per_hw_ver_libs] + optional_libgrl,
   link_with : [
@@ -275,7 +275,7 @@ if with_tests
     'vulkan_intel_test',
     [files('anv_gem_stubs.c'), anv_entrypoints[0]],
     include_directories : [
-      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+      inc_include, inc_src, inc_intel, inc_compiler,
     ],
     link_whole : libanv_common,
     link_with : [
@@ -307,7 +307,7 @@ if with_tests
           idep_vulkan_runtime, idep_intel_driver_ds, idep_intel_dev,
         ],
         include_directories : [
-          inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+          inc_include, inc_src, inc_intel, inc_compiler,
         ],
       ),
       suite : ['intel'],

src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c

@@ -22,7 +22,6 @@
  */
 
 #include "anv_nir.h"
-#include "program/prog_parameter.h"
 #include "nir/nir_builder.h"
 #include "compiler/brw_nir.h"
 #include "util/mesa-sha1.h"

src/intel/vulkan_hasvk/meson.build

@@ -82,7 +82,7 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']],
     'anv_per_hw_ver@0@'.format(_gfx_ver),
     [anv_per_hw_ver_files, g[1], anv_hasvk_entrypoints[0]],
     include_directories : [
-      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel,
+      inc_include, inc_src, inc_compiler, inc_intel,
     ],
     c_args : [
       no_override_init_args, sse2_args,
@@ -171,7 +171,7 @@ libanv_hasvk_common = static_library(
     gen_xml_pack,
   ],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel, inc_compiler,
     inc_util,
   ],
   c_args : anv_flags,
@@ -184,7 +184,7 @@ libvulkan_intel_hasvk = shared_library(
   'vulkan_intel_hasvk',
   [files('anv_gem.c'), anv_hasvk_entrypoints[0]],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel, inc_compiler,
   ],
   link_whole : [libanv_hasvk_common, libanv_per_hw_ver_libs],
   link_with : [
@@ -220,7 +220,7 @@ if with_tests
     'vulkan_intel_hasvk_test',
     [files('anv_gem_stubs.c'), anv_hasvk_entrypoints[0]],
     include_directories : [
-      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+      inc_include, inc_src, inc_intel, inc_compiler,
     ],
     link_whole : libanv_hasvk_common,
     link_with : [
@@ -252,7 +252,7 @@ if with_tests
           idep_vulkan_runtime, idep_intel_driver_ds,
         ],
         include_directories : [
-          inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+          inc_include, inc_src, inc_intel, inc_compiler,
         ],
       ),
       suite : ['intel'],