fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nil: Properly depend on nouveau winsys and nvidia-headers

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-01-30 20:11:54 -06:00 • committed by Marge Bot
parent 53215c98bb
commit 6eaa45933e
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nouveau/nil/meson.build
View file

@ -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',
)

4
src/nouveau/nil/nil_image_tic.c
View file

@ -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)