oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make video device setup consistent

Browse source 
Also restores some GTK compatibility with Virgil 3D by defaulting to `gl=es` when GTK output is used.
This commit is contained in:
Martin Wimpress 2020-03-21 16:56:59 +00:00
parent 4e9457a2b1
commit 3881e25b49
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
quickemu
View file

@ -92,10 +92,12 @@ function vm_boot() {
local BIOS="" local BIOS=""
local CPU="-cpu host,kvm=on" local CPU="-cpu host,kvm=on"
local GUEST_TWEAKS="" local GUEST_TWEAKS=""
local VIDEO_DRV="" local DISPLAY_DEVICE=""
local VIDEO=""
local GL="on" local GL="on"
local VIRGL="on" local VIRGL="on"
local OUTPUT="sdl" local OUTPUT="sdl"
local OUTPUT_EXTRA=""
local QEMU_VER=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1) local QEMU_VER=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1)
echo "Starting ${VM}" echo "Starting ${VM}"
echo " - QEMU: ${QEMU} v${QEMU_VER}" echo " - QEMU: ${QEMU} v${QEMU_VER}"
@ -122,12 +124,12 @@ function vm_boot() {
# Make any OS specific adjustments # Make any OS specific adjustments
case ${guest_os} in case ${guest_os} in
linux) linux)
VIDEO_DRV="virtio-vga" DISPLAY_DEVICE="virtio-vga"
;; ;;
windows) windows)
CPU="${CPU},hv_time" CPU="${CPU},hv_time"
GUEST_TWEAKS="-no-hpet" GUEST_TWEAKS="-no-hpet"
VIDEO_DRV="qxl" DISPLAY_DEVICE="qxl-vga"
;; ;;
*) *)
echo "ERROR! Unrecognised guest OS: ${guest_os}" echo "ERROR! Unrecognised guest OS: ${guest_os}"
@ -225,19 +227,21 @@ function vm_boot() {
# GL is not working with GTK currently # GL is not working with GTK currently
if [ "${OUTPUT}" == "gtk" ]; then if [ "${OUTPUT}" == "gtk" ]; then
GL="off" GL="es"
OUTPUT_EXTRA=",grab-on-hover=on,zoom-to-fit=on"
else else
echo " - Screen: ${X_RES}x${Y_RES}" echo " - Screen: ${X_RES}x${Y_RES}"
fi fi
if [ "${VIDEO_DRV}" == "qxl" ]; then if [ "${DISPLAY_DEVICE}" == "qxl-vga" ]; then
echo " - Video: ${VIDEO_DRV^^}" VIDEO="-device ${DISPLAY_DEVICE},xres=${X_RES},yres=${Y_RES}"
local VIDEO_DEV=" -vga ${VIDEO_DRV}" elif [ "${DISPLAY_DEVICE}" == "virtio-vga" ]; then
VIRGL="off" VIDEO="-device ${DISPLAY_DEVICE},virgl=${VIRGL},xres=${X_RES},yres=${Y_RES}"
else else
echo " - Video: ${VIDEO_DRV^^[v,g,a]}" VIDEO=" -device VGA,vgamem_mb=32xres=${X_RES},yres=${Y_RES}"
local VIDEO_DEV="-device ${VIDEO_DRV},virgl=${VIRGL},xres=${X_RES},yres=${Y_RES}"
fi fi
echo " - Video: ${DISPLAY_DEVICE}"
echo " - GL: ${GL^^}" echo " - GL: ${GL^^}"
echo " - Virgil3D: ${VIRGL^^}" echo " - Virgil3D: ${VIRGL^^}"
echo " - Display: ${OUTPUT^^}" echo " - Display: ${OUTPUT^^}"