openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 02:08:56 +00:00
Code Issues Projects Releases Wiki Activity

follow meson changes and build radix_sort as part of libvulkan_runtime

Browse Source 
avoids undefined symbols in intel vulkan libs
reported-by and ok tb@
This commit is contained in:
jsg
2025-06-11 13:08:26 +00:00
parent 4a8fc73364
commit c2fe528f9c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mesa/mk/libvulkan_radeon/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2025/06/05 14:18:51 jsg Exp $
# $OpenBSD: Makefile,v 1.16 2025/06/11 13:08:26 jsg Exp $
LIB= vulkan_radeon
@@ -102,12 +102,6 @@ SRCS+= radv_amdgpu_bo.c \
SRCS+= radv_llvm_helper.cpp \
radv_nir_to_llvm.c
# from src/vulkan/runtime/radix_sort/meson.build
SRCS+= barrier.c \
util.c \
radix_sort_u64.c \
radix_sort_vk.c
SRCS+= radv_entrypoints.c \
radv_annotate_layer.c
@@ -216,8 +210,5 @@ CLEANFILES+= lib${LIB}.so
.PATH: ${MESA_SRC}/src/amd/vulkan/nir
.PATH: ${MESA_SRC}/src/amd/vulkan/winsys/amdgpu
.PATH: ${MESA_SRC}/src/amd/vulkan/winsys/null
.PATH: ${MESA_SRC}/src/vulkan/runtime/radix_sort
.PATH: ${MESA_SRC}/src/vulkan/runtime/radix_sort/common
.PATH: ${MESA_SRC}/src/vulkan/runtime/radix_sort/common/vk
.PATH: ${MESA_SRC}/generated/src/amd/vulkan
.PATH: ${MESA_SRC}/generated/src/amd/vulkan/layers

11
lib/mesa/mk/libvulkan_runtime/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2025/06/05 14:18:51 jsg Exp $
# $OpenBSD: Makefile,v 1.6 2025/06/11 13:08:26 jsg Exp $
LIB= vulkan_runtime
@@ -72,6 +72,12 @@ SRCS+= vk_drm_syncobj.c \
SRCS+= vk_texcompress_astc.c \
vk_acceleration_structure.c
# from src/vulkan/runtime/radix_sort/meson.build
SRCS+= barrier.c \
util.c \
radix_sort_u64.c \
radix_sort_vk.c
.include "../Makefile.inc"
CFLAGS+= ${C_VIS_ARGS}
@@ -95,5 +101,8 @@ obj: _xenocara_obj
.include <bsd.xorg.mk>
.PATH: ${MESA_SRC}/src/vulkan/runtime
.PATH: ${MESA_SRC}/src/vulkan/runtime/radix_sort
.PATH: ${MESA_SRC}/src/vulkan/runtime/radix_sort/common
.PATH: ${MESA_SRC}/src/vulkan/runtime/radix_sort/common/vk
.PATH: ${MESA_SRC}/src/vulkan/runtime/rmv
.PATH: ${MESA_SRC}/generated/src/vulkan/runtime