From e4152eb8d089e170c9f78a8bf3c8b10fd42f086e Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 1 Dec 2011 13:03:25 +0100 Subject: [PATCH] make SW rendering an option in screenshot making --- misc/tools/xonotic-map-compiler-autobuild | 11 ++++++++--- misc/tools/xonotic-map-screenshot | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index cede0a22..867f9378 100755 --- 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 aee32664..d8876006 100755 --- 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' \ -- 2.39.2