SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-25 20:49:18 +00:00
parent a34e492c6b
commit acb2a22980
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
86 changed files with 12131 additions and 4602 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/mesa/mk/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2024/07/21 13:30:50 jsg Exp $
# $OpenBSD: Makefile,v 1.12 2024/07/25 06:54:05 jsg Exp $
.include "config.mk"
@ -39,7 +39,6 @@ SUBDIR+= libisl_gfx${GFX}
.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes" || \
${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
SUBDIR+= libva_st
SUBDIR+= libradeonwinsys
.endif
@ -102,8 +101,8 @@ SUBDIR+= libglapi libgbm libEGL libGL libGLESv1_CM libGLESv2 libOSMesa
SUBDIR+= libgallium_dri
.if ${WITH_VAAPI} == "yes" || make(obj)
SUBDIR+= libgallium_drv_video
.if ${WITH_GALLIUM_VA} == "yes" || make(obj)
SUBDIR+= libva_st libgallium_drv_video
.endif
.include <bsd.subdir.mk>

9
lib/mesa/mk/config.mk
View file

@ -197,7 +197,7 @@ WITH_GALLIUM_IRIS=no
WITH_AMD_VK=no
WITH_INTEL_VK=no
WITH_SSE41=no
WITH_VAAPI=no
WITH_GALLIUM_VA=no
WITH_DRI=yes
WITH_GALLIUM_DRISW_KMS=yes
@ -225,14 +225,12 @@ WITH_SSE41=yes
${MACHINE} == "sparc64"
WITH_GALLIUM_R300=yes
WITH_GALLIUM_R600=yes
WITH_VAAPI=yes
CPPFLAGS+= -DHAVE_R300 -DHAVE_R600
.endif
.if ${MACHINE} == "amd64" || ${MACHINE} == "arm64" || ${MACHINE} == "i386" || \
${MACHINE} == "powerpc64" || ${MACHINE} == "riscv64"
WITH_GALLIUM_RADEONSI=yes
WITH_VAAPI=yes
WITH_AMD_VK=yes
CPPFLAGS+= -DHAVE_RADEONSI
.endif
@ -245,3 +243,8 @@ WITH_INTEL_VK=yes
CPPFLAGS+= -DHAVE_I915 -DHAVE_CROCUS -DHAVE_IRIS \
-DSUPPORT_INTEL_INTEGRATED_GPUS
.endif
.if ${WITH_GALLIUM_R600} == "yes" || ${WITH_GALLIUM_RADEONSI} == "yes"
WITH_GALLIUM_VA=yes
CPPFLAGS+= -DHAVE_VA_SURFACE_ATTRIB_DRM_FORMAT_MODIFIERS
.endif

19
lib/mesa/mk/libgallium_drv_video/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2024/07/21 13:30:50 jsg Exp $
# $OpenBSD: Makefile,v 1.4 2024/07/25 00:18:21 jsg Exp $
LIB= gallium_drv_video
@ -22,11 +22,6 @@ CPPFLAGS+= -I${MESA_SRC}/src/gallium/include \
-I${MESA_SRC}/generated/src/gallium/drivers \
-DGALLIUM_SOFTPIPE
obj: _xenocara_obj
.include <bsd.lib.mk>
.include <bsd.xorg.mk>
.if ${WITH_GALLIUM_R600} == "yes"
GALLIUM_DRIVERS+= r600
CPPFLAGS+= -DGALLIUM_R600
@ -42,11 +37,19 @@ CPPFLAGS+= -DGALLIUM_LLVMPIPE
.endif
install:
.for driver in ${GALLIUM_DRIVERS}
${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/drivers/${driver}_drv_video.so
lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/dri
.for driver in ${GALLIUM_DRIVERS}
ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \
${DESTDIR}${X11BASE}/lib/modules/dri/${driver}_drv_video.so
.endfor
rm ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so
obj: _xenocara_obj
.include <bsd.lib.mk>
.include <bsd.xorg.mk>
SLIBS+= libdri \
libmesa \

8
lib/mesa/mk/libva_st/Makefile
View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2024/07/19 14:40:39 rsadowski Exp $
# $OpenBSD: Makefile,v 1.2 2024/07/23 08:22:36 jsg Exp $
.include <bsd.xconf.mk>
@ -32,9 +32,9 @@ SRCS= buffer.c \
CFLAGS+= ${C_VIS_ARGS}
CXXFLAGS+= ${CXX_VIS_ARGS}
# XXX keep in sync with libva
CFLAGS += -DVA_DRIVER_INIT_FUNC=__vaDriverInit_1_22
CPPFLAGS += -DVA_DRIVER_INIT_FUNC=__vaDriverInit_1_22
VA_INIT!= pkg-config --modversion libva \
| awk -F. '{printf "__vaDriverInit_%d_%d\n", $$1, $$2}'
CPPFLAGS+= -DVA_DRIVER_INIT_FUNC=${VA_INIT}
CPPFLAGS+= -I${MESA_SRC}/src/gallium/frontends/va \
-I${MESA_SRC}/src/gallium/include \

5
lib/mesa/src/amd/llvm/ac_llvm_helper.cpp
View file

@ -299,17 +299,12 @@ LLVMPassManagerRef ac_create_passmgr(LLVMTargetLibraryInfoRef target_library_inf
*/
unwrap(passmgr)->add(createBarrierNoopPass());
/* This pass eliminates all loads and stores on alloca'd pointers. */
unwrap(passmgr)->add(createPromoteMemoryToRegisterPass());
#if LLVM_VERSION_MAJOR >= 16
unwrap(passmgr)->add(createSROAPass(true));
#else
unwrap(passmgr)->add(createSROAPass());
#endif
/* TODO: restore IPSCCP */
if (LLVM_VERSION_MAJOR >= 16)
unwrap(passmgr)->add(createLoopSinkPass());
/* TODO: restore IPSCCP */
unwrap(passmgr)->add(createLICMPass());
unwrap(passmgr)->add(createCFGSimplificationPass());
/* This is recommended by the instruction combining pass. */

4
lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_init.c
View file

@ -613,7 +613,11 @@ gallivm_compile_module(struct gallivm_state *gallivm)
LLVMRunPasses(gallivm->module, passes, LLVMGetExecutionEngineTargetMachine(gallivm->engine), opts);
if (!(gallivm_perf & GALLIVM_PERF_NO_OPT))
#if LLVM_VERSION_MAJOR >= 18
strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,instsimplify,instcombine<no-verify-fixpoint>");
#else
strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,instsimplify,instcombine");
#endif
else
strcpy(passes, "mem2reg");