From 1b3825a1004652024dc0e921acd6bd5d6e50f025 Mon Sep 17 00:00:00 2001 From: rogerman Date: Sat, 10 Dec 2016 12:17:11 -0800 Subject: [PATCH] =?UTF-8?q?Command=20Line:=20Allow=20texture=20post-proces?= =?UTF-8?q?sing=20options=20on=20non-Windows=20platforms.=20The=20?= =?UTF-8?q?=E2=80=943d-texture-deposterize-enable,=20=E2=80=943d-texture-u?= =?UTF-8?q?pscale=20and=20=E2=80=943d-texture-smoothing-enable=20options?= =?UTF-8?q?=20work=20independently=20of=20the=20frontend,=20and=20so=20it?= =?UTF-8?q?=20should=20be=20safe=20to=20make=20these=20options=20universal?= =?UTF-8?q?ly=20available.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desmume/src/commandline.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp index d1945d105..9b1fbdda5 100644 --- a/desmume/src/commandline.cpp +++ b/desmume/src/commandline.cpp @@ -50,8 +50,8 @@ CommandLine::CommandLine() , _spu_advanced(0) , _num_cores(-1) , _rigorous_timing(0) -, _advanced_timing(-1) -, _texture_deposterize(-1) +, _advanced_timing(-1) +, _texture_deposterize(-1) , _texture_smooth(-1) , _slot1(NULL) , _slot1_fat_dir(NULL) @@ -68,8 +68,8 @@ CommandLine::CommandLine() , arm7_gdb_port(0) , start_paused(FALSE) , autodetect_method(-1) -, render3d(COMMANDLINE_RENDER3D_DEFAULT) -, texture_upscale(-1) +, render3d(COMMANDLINE_RENDER3D_DEFAULT) +, texture_upscale(-1) , gpu_resolution_multiplier(-1) , language(1) //english by default { @@ -100,7 +100,6 @@ static const char* help_string = \ " --spu-method N Select SPU synch method: 0:N, 1:Z, 2:P; default 0" ENDL " --3d-render [SW|AUTOGL|GL|OLDGL]" ENDL " Select 3d renderer; default SW" ENDL -#ifdef HOST_WINDOWS " --3d-texture-deposterize-enable" ENDL " Enables texture deposterization." ENDL " --3d-texture-upscale [1|2|4]" ENDL @@ -109,6 +108,7 @@ static const char* help_string = \ " 4:4x upscaling" ENDL " --3d-texture-smoothing-enable" ENDL " Enables smooth texture sampling while rendering." ENDL +#ifdef HOST_WINDOWS " --gpu-resolution-multiplier N" ENDL " Increases the resolution of GPU rendering by this" ENDL " multipler; 1:256x192 (default), 2:512x384," ENDL @@ -228,11 +228,10 @@ bool CommandLine::parse(int argc,char **argv) { "spu-synch", no_argument, &_spu_sync_mode, 1 }, { "spu-method", required_argument, NULL, OPT_SPU_METHOD }, { "3d-render", required_argument, NULL, OPT_3D_RENDER }, - + { "3d-texture-deposterize-enable", no_argument, &_texture_deposterize, 1 }, + { "3d-texture-upscale", required_argument, NULL, OPT_3D_TEXTURE_UPSCALE }, + { "3d-texture-smoothing-enable", no_argument, &_texture_smooth, 1 }, #ifdef HOST_WINDOWS - { "3d-texture-deposterize-enable", no_argument, &_texture_deposterize, 1 }, - { "3d-texture-upscale", required_argument, NULL, OPT_3D_TEXTURE_UPSCALE }, - { "3d-texture-smoothing-enable", no_argument, &_texture_smooth, 1 }, { "gpu-resolution-multiplier", required_argument, NULL, OPT_GPU_RESOLUTION_MULTIPLIER }, #else { "disable-sound", no_argument, &disable_sound, 1},