• Tobias Klausmann's avatar
    amd/vulkan: meson build - use radv_deps for libvulkan_radeon · 9401a2f2
    Tobias Klausmann authored
    Without this the build breaks with:
    
    FAILED: src/amd/vulkan/src@amd@vulkan@@vulkan_radeon@sha/radv_pipeline.c.o
    cc -Isrc/amd/vulkan/src@amd@vulkan@@vulkan_radeon@sha -Isrc/amd/vulkan
    -I../src/amd/vulkan -Isrc/../include -I../src/../include -Isrc -I../src
    -Isrc/mapi -I../src/mapi -Isrc/mesa -I../src/mesa -I../src/gallium/include
    -Isrc/gallium/auxiliary -I../src/gallium/auxiliary -Isrc/amd -I../src/amd
    -Isrc/amd/common -I../src/amd/common -Isrc/compiler -I../src/compiler
    -Isrc/vulkan/util -I../src/vulkan/util -Isrc/vulkan/wsi -I../src/vulkan/wsi
    -Isrc/compiler/nir -I../src/compiler/nir -I/usr/include -I/usr/include/libdrm
    -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch
    -std=c99 -O2 -g '-DVERSION="18.3.0-rc5"' -DPACKAGE_VERSION=VERSION
    '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"'
    -DGLX_USE_TLS -DHAVE_ST_VDPAU -DENABLE_ST_OMX_BELLAGIO=0
    -DENABLE_ST_OMX_TIZONIA=0 -DHAVE_X11_PLATFORM -DGLX_INDIRECT_RENDERING
    -DGLX_DIRECT_RENDERING -DGLX_USE_DRM -DHAVE_DRM_PLATFORM -DENABLE_SHADER_CACHE
    -DHAVE___BUILTIN_BSWAP32 -DHAVE___BUILTIN_BSWAP64 -DHAVE___BUILTIN_CLZ
    -DHAVE___BUILTIN_CLZLL -DHAVE___BUILTIN_CTZ -DHAVE___BUILTIN_EXPECT
    -DHAVE___BUILTIN_FFS -DHAVE___BUILTIN_FFSLL -DHAVE___BUILTIN_POPCOUNT
    -DHAVE___BUILTIN_POPCOUNTLL -DHAVE___BUILTIN_UNREACHABLE
    -DHAVE_FUNC_ATTRIBUTE_CONST -DHAVE_FUNC_ATTRIBUTE_FLATTEN
    -DHAVE_FUNC_ATTRIBUTE_MALLOC -DHAVE_FUNC_ATTRIBUTE_PURE
    -DHAVE_FUNC_ATTRIBUTE_UNUSED -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT
    -DHAVE_FUNC_ATTRIBUTE_WEAK -DHAVE_FUNC_ATTRIBUTE_FORMAT
    -DHAVE_FUNC_ATTRIBUTE_PACKED -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL
    -DHAVE_FUNC_ATTRIBUTE_VISIBILITY -DHAVE_FUNC_ATTRIBUTE_ALIAS
    -DHAVE_FUNC_ATTRIBUTE_NORETURN -DUSE_SSE41 -DUSE_GCC_ATOMIC_BUILTINS
    -DUSE_X86_64_ASM -DMAJOR_IN_SYSMACROS -DHAVE_SYS_SYSCTL_H -DHAVE_LINUX_FUTEX_H
    -DHAVE_ENDIAN_H -DHAVE_DLFCN_H -DHAVE_STRTOF -DHAVE_MKOSTEMP
    -DHAVE_POSIX_MEMALIGN -DHAVE_TIMESPEC_GET -DHAVE_MEMFD_CREATE -DHAVE_STRTOD_L
    -DHAVE_DLADDR -DHAVE_DL_ITERATE_PHDR -DHAVE_ZLIB -DHAVE_PTHREAD
    -DHAVE_PTHREAD_SETAFFINITY -DHAVE_LIBDRM -DHAVE_LLVM=0x0600
    -DMESA_LLVM_VERSION_PATCH=1 -DHAVE_WAYLAND_PLATFORM -DWL_HIDE_DEPRECATED
    -DHAVE_DRI3 -DHAVE_DRI3_MODIFIERS -Werror=implicit-function-declaration
    -Werror=missing-prototypes -Werror=return-type -fno-math-errno
    -fno-trapping-math -Wno-missing-field-initializers -Wno-format-truncation -O2
    -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
    -fasynchronous-unwind-tables -fstack-clash-protection -DNDEBUG -fPIC -pthread
    -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
    -D__STDC_LIMIT_MACROS -fvisibility=hidden -Wno-override-init
    -DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XLIB_KHR
    -DVK_USE_PLATFORM_WAYLAND_KHR -DVK_USE_PLATFORM_DISPLAY_KHR
    -DVK_USE_PLATFORM_XLIB_XRANDR_EXT  -MD -MQ
    'src/amd/vulkan/src@amd@vulkan@@vulkan_radeon@sha/radv_pipeline.c.o' -MF
    'src/amd/vulkan/src@amd@vulkan@@vulkan_radeon@sha/radv_pipeline.c.o.d' -o
    'src/amd/vulkan/src@amd@vulkan@@vulkan_radeon@sha/radv_pipeline.c.o' -c
    ../src/amd/vulkan/radv_pipeline.c
    In file included from ../src/vulkan/util/vk_alloc.h:29,
                     from ../src/amd/vulkan/radv_private.h:52,
                     from ../src/amd/vulkan/radv_debug.h:27,
                     from ../src/amd/vulkan/radv_pipeline.c:30:
    ../src/../include/vulkan/vulkan.h:54:10: fatal error: wayland-client.h: Datei
    oder Verzeichnis nicht gefunden
     #include <wayland-client.h>
              ^~~~~~~~~~~~~~~~~~
    compilation terminated.
    
    The above command misses the include directory for wayland:
        -I/usr/include/wayland
    
    The missing include is contained in the (until now) unused radv_deps:
    
    if with_platform_wayland
      radv_deps += dep_wayland_client
      radv_flags += '-DVK_USE_PLATFORM_WAYLAND_KHR'
      libradv_files += files('radv_wsi_wayland.c')
    endif
    
    Fixes: 673dda83 "meson: build "radv" vulkan driver for radeon hardware"
    Signed-off-by: default avatarTobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
    Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
    Reviewed-by: Dylan Baker's avatarDylan Baker <dylan@pnwbakers.com>
    9401a2f2
Name
Last commit
Last update
bin Loading commit data...
build-support Loading commit data...
docs Loading commit data...
doxygen Loading commit data...
include Loading commit data...
m4 Loading commit data...
scons Loading commit data...
scripts Loading commit data...
src Loading commit data...
.dir-locals.el Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.mailmap Loading commit data...
.travis.yml Loading commit data...
Android.common.mk Loading commit data...
Android.mk Loading commit data...
CleanSpec.mk Loading commit data...
Makefile.am Loading commit data...
README.rst Loading commit data...
REVIEWERS Loading commit data...
SConstruct Loading commit data...
VERSION Loading commit data...
appveyor.yml Loading commit data...
autogen.sh Loading commit data...
common.py Loading commit data...
configure.ac Loading commit data...
install-gallium-links.mk Loading commit data...
install-lib-links.mk Loading commit data...
meson.build Loading commit data...
meson_options.txt Loading commit data...