ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from davg-qqq/feat-linux-msaa-ui 

Linux GTK Port: Fix config for new MSAA options
This commit is contained in:
zeromus 2020-05-08 18:18:27 -04:00 committed by GitHub
parent 1305dd1e49 4186c33745
commit 255f5c8b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/frontend/posix/gtk/config_opts.h
View File

@ -62,6 +62,7 @@ OPT(textureSmoothing, bool, false, Config, 3DTextureSmoothing)
OPT(textureUpscale, int, 1, Config, 3DTextureUpscaling) OPT(textureUpscale, int, 1, Config, 3DTextureUpscaling)
OPT(highColorInterpolation, bool, true, Config, HighResolutionColorInterpolation) OPT(highColorInterpolation, bool, true, Config, HighResolutionColorInterpolation)
OPT(multisampling, bool, false, Config, OpenGLMultisampling) OPT(multisampling, bool, false, Config, OpenGLMultisampling)
OPT(multisamplingSize, int, 0, Config, OpenGLMultisamplingSize)
OPT(command_line_overriding_firmware_language, bool, false, Config, CommandLineOverridingFirmwareLanguage) OPT(command_line_overriding_firmware_language, bool, false, Config, CommandLineOverridingFirmwareLanguage)
OPT(firmware_language, int, 1, Config, FirmwareLanguage) OPT(firmware_language, int, 1, Config, FirmwareLanguage)

6
desmume/src/frontend/posix/gtk/main.cpp
View File

@ -2416,6 +2416,8 @@ static void GraphicsSettingsDialog() {
CommonSettings.GFX3D_HighResolutionInterpolateColor = config.highColorInterpolation = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wHCInterpolate)); CommonSettings.GFX3D_HighResolutionInterpolateColor = config.highColorInterpolation = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wHCInterpolate));
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
int selectedMultisample = gtk_combo_box_get_active(GTK_COMBO_BOX(wMultisample)); int selectedMultisample = gtk_combo_box_get_active(GTK_COMBO_BOX(wMultisample));
config.multisamplingSize = multisampleSizes[selectedMultisample];
config.multisampling = selectedMultisample != 0;
CommonSettings.GFX3D_Renderer_MultisampleSize = multisampleSizes[selectedMultisample]; CommonSettings.GFX3D_Renderer_MultisampleSize = multisampleSizes[selectedMultisample];
#endif #endif
} }
@ -3528,7 +3530,9 @@ common_gtk_main( class configured_features *my_config)
} }
CommonSettings.GFX3D_HighResolutionInterpolateColor = config.highColorInterpolation; CommonSettings.GFX3D_HighResolutionInterpolateColor = config.highColorInterpolation;
CommonSettings.GFX3D_Renderer_MultisampleSize = (config.multisampling) ? 4 : 0; CommonSettings.GFX3D_Renderer_MultisampleSize = (config.multisamplingSize > 0)
? config.multisamplingSize
: config.multisampling ? 4 : 0;
CommonSettings.GFX3D_Renderer_TextureDeposterize = config.textureDeposterize; CommonSettings.GFX3D_Renderer_TextureDeposterize = config.textureDeposterize;
CommonSettings.GFX3D_Renderer_TextureScalingFactor = (config.textureUpscale == 1 || CommonSettings.GFX3D_Renderer_TextureScalingFactor = (config.textureUpscale == 1 ||
config.textureUpscale == 2 || config.textureUpscale == 2 ||