make SW rendering an option in screenshot making

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index cede0a22d83cbdf41804b996a86bbd83f5256502..867f9378e50f6eed99a6b924ae7e971258ecaaba 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -228,9 +228,14 @@ screenshotthemap()
                if [ -n "$DISPLAY" ]; then
                        misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
                else
-                       #startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
-                       #startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -gl_driver /usr/local/lib/gallium3d/libGL.so -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
-                       startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
+                       case "$DRIVER" in
+                               gl)
+                                       startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
+                                       ;;
+                               soft|*)
+                                       startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"vid_soft 1" +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
+                                       ;;
+                       esac
                fi
        )
        if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then

diff --git a/misc/tools/xonotic-map-screenshot b/misc/tools/xonotic-map-screenshot
index aee32664d44ed3e003409fb44fcb201c3910e0ad..d8876006459ea923c8925d083db9cdb6f03ab1d3 100755 (executable)
--- a/misc/tools/xonotic-map-screenshot
+++ b/misc/tools/xonotic-map-screenshot
@@ -13,7 +13,6 @@ count=`yes x | head -n "$count" | tr -cd x`
        +'scr_screenshot_timestamp 0' \
        +'vid_fullscreen 0' \
        +'exec effects-ultimate.cfg' \
-       +'vid_soft 1' \
        "$@" \
        +'r_motionblur 0' \
        +'r_damageblur 0' \