From 6eaa45933e44b4af7756dcd0f72c3d4cd200bf78 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:11:54 -0600
Subject: [PATCH] nil: Properly depend on nouveau winsys and nvidia-headers

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/nil/meson.build     | 8 +++++++-
 src/nouveau/nil/nil_image_tic.c | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/nouveau/nil/meson.build b/src/nouveau/nil/meson.build
index 2426e23e92f..b5bcc292e8c 100644
--- a/src/nouveau/nil/meson.build
+++ b/src/nouveau/nil/meson.build
@@ -26,11 +26,17 @@ libnil_files = files(
   'nil_image_tic.c',
 )
 
+libnil_deps = [
+  idep_mesautil,
+  idep_nouveau_ws,
+  idep_nvidia_headers,
+]
+
 _libnil = static_library(
   'nil',
   libnil_files,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium],
-  dependencies : idep_mesautil,
+  dependencies : libnil_deps,
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/nouveau/nil/nil_image_tic.c b/src/nouveau/nil/nil_image_tic.c
index ca4b6ae5004..187892db2c4 100644
--- a/src/nouveau/nil/nil_image_tic.c
+++ b/src/nouveau/nil/nil_image_tic.c
@@ -3,8 +3,8 @@
 #include "nil_format.h"
 #include "util/bitpack_helpers.h"
 
-#include "nouveau/nvidia-headers/classes/clb097tex.h"
-#include "nouveau/winsys/drf.h"
+#include "clb097tex.h"
+#include "drf.h"
 
 ALWAYS_INLINE static void
 __set_u32(uint32_t *o, uint32_t v, unsigned lo, unsigned hi)