Skip to content

Commit 2386c4b

Browse files
committed
add platform flag "vulkan"
1 parent b956140 commit 2386c4b

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

scriptmodules/emulators/ppsspp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function build_ppsspp() {
143143
params+=(-DCMAKE_TOOLCHAIN_FILE="$md_data/tinker.armv7.cmake")
144144
fi
145145
isPlatform "vero4k" && params+=(-DCMAKE_TOOLCHAIN_FILE="cmake/Toolchains/vero4k.armv8.cmake")
146-
if isPlatform "arm" && ! isPlatform "x11"; then
146+
if isPlatform "arm" && ! isPlatform "vulkan"; then
147147
params+=(-DARM_NO_VULKAN=ON)
148148
fi
149149
if [[ "$md_id" == "lr-ppsspp" ]]; then

scriptmodules/emulators/retroarch.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ function depends_retroarch() {
2121
isPlatform "gles" && ! isPlatform "vero4k" && depends+=(libgles2-mesa-dev)
2222
isPlatform "mesa" && depends+=(libx11-xcb-dev)
2323
isPlatform "mali" && depends+=(mali-fbdev)
24-
isPlatform "x11" && depends+=(libx11-xcb-dev libpulse-dev libvulkan-dev mesa-vulkan-drivers)
24+
isPlatform "x11" && depends+=(libx11-xcb-dev libpulse-dev)
25+
isPlatform "vulkan" && depends+=(libvulkan-dev mesa-vulkan-drivers)
2526
isPlatform "vero4k" && depends+=(vero3-userland-dev-osmc zlib1g-dev libfreetype6-dev)
2627
isPlatform "kms" && depends+=(libgbm-dev)
2728

@@ -58,8 +59,8 @@ function build_retroarch() {
5859
isPlatform "kms" && params+=(--enable-kms --enable-egl)
5960
isPlatform "arm" && params+=(--enable-floathard)
6061
isPlatform "neon" && params+=(--enable-neon)
61-
isPlatform "x11" && params+=(--enable-vulkan)
62-
! isPlatform "x11" && params+=(--disable-vulkan --disable-wayland)
62+
isPlatform "vulkan" && params+=(--enable-vulkan) || params+=(--disable-vulkan)
63+
! isPlatform "x11" && params+=(--disable-wayland)
6364
isPlatform "vero4k" && params+=(--enable-mali_fbdev --with-opengles_libs='-L/opt/vero3/lib')
6465
./configure --prefix="$md_inst" "${params[@]}"
6566
make clean

scriptmodules/libretrocores/lr-flycast.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ function build_lr-flycast() {
5757
fi
5858
isPlatform "aarch64" && params+=("WITH_DYNAREC=arm64" "HOST_CPU_FLAGS=-DTARGET_LINUX_ARMv8")
5959
isPlatform "arm" && params+=("WITH_DYNAREC=arm")
60-
! isPlatform "x86" && params+=("HAVE_GENERIC_JIT=0" "HAVE_VULKAN=0")
60+
! isPlatform "x86" && params+=("HAVE_GENERIC_JIT=0")
61+
isPlatform "vulkan" && params+=("HAVE_VULKAN=1") || params+=("HAVE_VULKAN=0")
6162
make "${params[@]}" clean
6263
CFLAGS+=" ${add_flags[@]}" make "${params[@]}"
6364
md_ret_require="$md_build/flycast_libretro.so"

scriptmodules/supplementary/sdl2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function build_sdl2() {
7777
# disable vulkan and X11 video support
7878
conf_flags+=("--disable-video-x11")
7979
fi
80-
! isPlatform "x11" && conf_flags+=("--disable-video-vulkan")
80+
isPlatform "vulkan" && conf_flags+=("--enable-video-vulkan") || conf_flags+=("--disable-video-vulkan")
8181
isPlatform "mali" && conf_flags+=("--enable-video-mali" "--disable-video-opengl")
8282
isPlatform "rpi" && conf_flags+=("--enable-video-rpi")
8383
isPlatform "kms" || isPlatform "rpi" && conf_flags+=("--enable-video-kmsdrm")

scriptmodules/system.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -569,37 +569,37 @@ function platform_odroid-xu() {
569569

570570
function platform_tegra-x1() {
571571
cpu_armv8 "cortex-a57+crypto"
572-
__platform_flags+=(x11 gl)
572+
__platform_flags+=(x11 gl vulkan)
573573
}
574574

575575
function platform_tegra-x2() {
576576
cpu_armv8 "cortex-a57+crypto"
577-
__platform_flags+=(x11 gl)
577+
__platform_flags+=(x11 gl vulkan)
578578
}
579579

580580
function platform_xavier() {
581581
cpu_armv8 "native"
582-
__platform_flags+=(x11 gl)
582+
__platform_flags+=(x11 gl vulkan)
583583
}
584584

585585
function platform_tegra-3() {
586586
cpu_armv7 "cortex-a9"
587-
__platform_flags+=(x11 gles)
587+
__platform_flags+=(x11 gles vulkan)
588588
}
589589

590590
function platform_tegra-4() {
591591
cpu_armv7 "cortex-a15"
592-
__platform_flags+=(x11 gles)
592+
__platform_flags+=(x11 gles vulkan)
593593
}
594594

595595
function platform_tegra-k1-32() {
596596
cpu_armv7 "cortex-a15"
597-
__platform_flags+=(x11 gl)
597+
__platform_flags+=(x11 gl vulkan)
598598
}
599599

600600
function platform_tegra-k1-64() {
601601
cpu_armv8 "native"
602-
__platform_flags+=(x11 gl)
602+
__platform_flags+=(x11 gl vulkan)
603603
}
604604

605605
function platform_tinker() {
@@ -611,7 +611,7 @@ function platform_tinker() {
611611

612612
function platform_native() {
613613
__default_cpu_flags="-march=native"
614-
__platform_flags+=(gl)
614+
__platform_flags+=(gl vulkan)
615615
if [[ "$__has_kms" -eq 1 ]]; then
616616
__platform_flags+=(kms)
617617
else

0 commit comments

Comments
 (0)