Merge branch 'patch-1' into 'master'

[xonotic/xonotic.git] / misc / tools / the-big-benchmark / the-big-benchmark.bat

diff --git a/misc/tools/the-big-benchmark/the-big-benchmark.bat b/misc/tools/the-big-benchmark/the-big-benchmark.bat
index a027a75f0101912b1876c852900cdf75e9b1decc..c257ed71077fd573b5adf1cdf10006d9998f1efe 100644 (file)
--- a/misc/tools/the-big-benchmark/the-big-benchmark.bat
+++ b/misc/tools/the-big-benchmark/the-big-benchmark.bat
@@ -16,17 +16,17 @@ goto postarg
 :noarg\r
 if "%ProgramFiles(x86)%" == "" goto bit32\r
 :bit64\r
-set xonotic=xonotic-x64.exe\r
+set xonotic=xonotic.exe\r
 goto postarg\r
 :bit32\r
-set xonotic=xonotic.exe\r
+set xonotic=xonotic-x86.exe\r
 goto postarg\r
 :postarg\r
 \r
 if exist data\the-big-benchmark.log del data\the-big-benchmark.log\r
 if exist data\benchmark.log del data\benchmark.log\r
 if exist data\engine.log del data\engine.log\r
-set p=+r_texture_dds_load 1 +cl_playerdetailreduction 0 +developer 1 -nohome -benchmarkruns 4 -benchmarkruns_skipfirst -benchmark demos/the-big-keybench.dem\r
+set p=+vid_width 1024 +vid_height 768 +vid_desktopfullscreen 0 +cl_curl_enabled 0 +r_texture_dds_load 1 +cl_playerdetailreduction 0 +developer 1 -nohome -benchmarkruns 4 -benchmarkruns_skipfirst -benchmark demos/the-big-keybench.dem\r
 \r
 goto start\r
 \r
@@ -46,6 +46,12 @@ if errorlevel 1 goto nomed
 echo OpenGL 2.0 or later required for Normal quality and higher, exiting.\r
 goto done\r
 :nomed\r
+if not "%e%" == "med" goto nomed2\r
+find "Using GL1.3 rendering path" data\engine.log >nul\r
+if errorlevel 1 goto nomed2\r
+echo OpenGL 2.0 rendering disabled, exiting.\r
+goto done\r
+:nomed2\r
 if not "%e%" == "high" goto nohigh\r
 find "vid_soft 1" data\engine.log >nul\r
 if errorlevel 1 goto nohigh\r