From d8ed2917519f8c2717770f8ec96462242d781187 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Mon, 5 Jun 2023 04:43:53 +0800
Subject: [PATCH] pvr: decouple vulkan driver and compiler from gallium

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-By: Matt Coster <matt.coster@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23438>
---
 src/imagination/rogue/meson.build       | 4 ----
 src/imagination/rogue/tools/meson.build | 4 ----
 src/imagination/vulkan/meson.build      | 3 ---
 src/imagination/vulkan/pvr_device.c     | 1 -
 src/imagination/vulkan/pvr_tex_state.c  | 1 -
 5 files changed, 13 deletions(-)

diff --git a/src/imagination/rogue/meson.build b/src/imagination/rogue/meson.build
index bb10220..7224ff0 100644
--- a/src/imagination/rogue/meson.build
+++ b/src/imagination/rogue/meson.build
@@ -63,10 +63,6 @@ libpowervr_rogue = shared_library(
     inc_include,
     inc_compiler,
     inc_src,
-    inc_mapi,
-    inc_mesa,
-    inc_gallium,
-    inc_gallium_aux,
   ],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
diff --git a/src/imagination/rogue/tools/meson.build b/src/imagination/rogue/tools/meson.build
index f3d0e50..41e236d 100644
--- a/src/imagination/rogue/tools/meson.build
+++ b/src/imagination/rogue/tools/meson.build
@@ -27,13 +27,9 @@ rogue_compiler = executable(
   link_with : [libpowervr_rogue],
   dependencies : [idep_mesautil, idep_nir, idep_vulkan_runtime, dep_csbgen],
   include_directories : [
-    inc_mesa,
     inc_imagination,
     inc_include,
     inc_src,
-    inc_mapi,
-    inc_gallium,
-    inc_gallium_aux,
     inc_compiler,
     inc_rogue,
   ],
diff --git a/src/imagination/vulkan/meson.build b/src/imagination/vulkan/meson.build
index 6a16acf..109f526 100644
--- a/src/imagination/vulkan/meson.build
+++ b/src/imagination/vulkan/meson.build
@@ -115,12 +115,9 @@ libvulkan_powervr_mesa = shared_library(
   [pvr_files, pvr_entrypoints, u_format_pack_h],
   include_directories : [
     pvr_includes,
-    inc_gallium_aux,
     inc_imagination,
     inc_include,
     inc_src,
-    inc_mesa,
-    inc_gallium,
     inc_compiler,
   ],
   link_with : [
diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c
index 9f380c4..9613b84 100644
--- a/src/imagination/vulkan/pvr_device.c
+++ b/src/imagination/vulkan/pvr_device.c
@@ -39,7 +39,6 @@
 #include <xf86drm.h>
 
 #include "hwdef/rogue_hw_utils.h"
-#include "pipe/p_defines.h"
 #include "pvr_bo.h"
 #include "pvr_border.h"
 #include "pvr_clear.h"
diff --git a/src/imagination/vulkan/pvr_tex_state.c b/src/imagination/vulkan/pvr_tex_state.c
index 4de0e99..43d7b0a 100644
--- a/src/imagination/vulkan/pvr_tex_state.c
+++ b/src/imagination/vulkan/pvr_tex_state.c
@@ -25,7 +25,6 @@
 #include <vulkan/vulkan.h>
 
 #include "hwdef/rogue_hw_defs.h"
-#include "pipe/p_defines.h"
 #include "pvr_csb.h"
 #include "pvr_device_info.h"
 #include "pvr_formats.h"
-- 
2.7.4