From 5a882673667a788a84f2cbc207b455fe28d350e1 Mon Sep 17 00:00:00 2001
From: Caio Oliveira <caio.oliveira@intel.com>
Date: Wed, 24 Jan 2024 10:51:21 -0800
Subject: [PATCH] intel: Add missing dependencies on blorp

Various components implicitly depend on blorp, make this explicit.

Checked by setting a 'compiler_args' on idep_intel_blorp and verifying
it on blorp_priv.h header.

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27643>
---
 src/gallium/drivers/crocus/meson.build | 2 +-
 src/gallium/drivers/iris/meson.build   | 3 ++-
 src/intel/ds/meson.build               | 2 +-
 src/intel/vulkan/meson.build           | 3 ++-
 src/intel/vulkan_hasvk/meson.build     | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build
index 4ac899113ad..2cbad5a6dff 100644
--- a/src/gallium/drivers/crocus/meson.build
+++ b/src/gallium/drivers/crocus/meson.build
@@ -64,7 +64,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80']
       '-DGFX_VERx10=@0@'.format(v),
     ],
     gnu_symbol_visibility : 'hidden',
-    dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers, idep_intel_dev],
+    dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers, idep_intel_dev, idep_intel_blorp],
   )
 endforeach
 
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 268935a55f7..822350f62db 100644
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -82,7 +82,8 @@ foreach v : ['80', '90', '110', '120', '125', '200']
     ],
     gnu_symbol_visibility : 'hidden',
     dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers,
-                    idep_intel_driver_ds_headers, idep_intel_shaders, ],
+                    idep_intel_driver_ds_headers, idep_intel_shaders,
+                    idep_intel_blorp],
   )
 endforeach
 
diff --git a/src/intel/ds/meson.build b/src/intel/ds/meson.build
index 88f312e5f46..5f177e4f00c 100644
--- a/src/intel/ds/meson.build
+++ b/src/intel/ds/meson.build
@@ -38,7 +38,7 @@ libintel_driver_ds = static_library(
   sources : ['intel_driver_ds.cc', intel_tracepoint_files],
   include_directories : [inc_src, inc_include, inc_intel],
   link_with : [libintel_perf, libintel_common],
-  dependencies : [libintel_driver_ds_deps, idep_intel_dev],
+  dependencies : [libintel_driver_ds_deps, idep_intel_dev, idep_intel_blorp],
   gnu_symbol_visibility : 'hidden',
 )
 
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index e2029d1e62c..7b2ad564529 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -130,7 +130,7 @@ foreach _gfx_ver : ['90', '110', '120', '125', '200']
       dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml,
       idep_vulkan_util_headers, idep_vulkan_wsi_headers,
       idep_vulkan_runtime_headers, idep_intel_driver_ds_headers,
-      idep_grl, idep_intel_shaders,
+      idep_grl, idep_intel_shaders, idep_intel_blorp,
     ],
   )
 endforeach
@@ -207,6 +207,7 @@ anv_deps = [
   idep_vulkan_runtime_headers,
   idep_vulkan_wsi_headers,
   idep_intel_shaders,
+  idep_intel_blorp,
 ]
 
 if with_platform_x11
diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build
index e9b4737175c..ba7014b2f6b 100644
--- a/src/intel/vulkan_hasvk/meson.build
+++ b/src/intel/vulkan_hasvk/meson.build
@@ -94,6 +94,7 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']],
       dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml,
       idep_vulkan_util_headers, idep_vulkan_wsi_headers,
       idep_vulkan_runtime_headers, idep_intel_driver_ds_headers,
+      idep_intel_blorp,
     ],
   )
 endforeach