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

Linux GTK Port: Fix compiling for GTK port. (Regression from commit 064527e.) 

- The new behavior for the Multisample Antialiasing checkbox: Checked - GFX3D_Renderer_MultisampleSize = 4, Unchecked - GFX3D_Renderer_MultisampleSize = 0. (If someone else wants to make some UI so that GFX3D_Renderer_MultisampleSize can be set to other sizes, then have at it.)
This commit is contained in:
rogerman 2018-10-25 11:55:44 -07:00
parent e2d60f62fd
commit 2e7099052d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2238,7 +2238,7 @@ static void GraphicsSettingsDialog() {
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
// OpenGL Multisample // OpenGL Multisample
wMultisample = gtk_check_button_new_with_label("Multisample Antialiasing (OpenGL)"); wMultisample = gtk_check_button_new_with_label("Multisample Antialiasing (OpenGL)");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wMultisample), CommonSettings.GFX3D_Renderer_Multisample); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wMultisample), (CommonSettings.GFX3D_Renderer_MultisampleSize > 0) ? TRUE : FALSE);
gtk_table_attach(GTK_TABLE(wTable), wMultisample, 1, 2, 2, 3, gtk_table_attach(GTK_TABLE(wTable), wMultisample, 1, 2, 2, 3,
static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL),
static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 10, 0); static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 10, 0);
@ -2309,7 +2309,8 @@ static void GraphicsSettingsDialog() {
CommonSettings.GFX3D_Renderer_TextureScalingFactor = config.textureUpscale = scale; CommonSettings.GFX3D_Renderer_TextureScalingFactor = config.textureUpscale = scale;
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
CommonSettings.GFX3D_Renderer_Multisample = config.multisampling = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wMultisample)); config.multisampling = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wMultisample));
CommonSettings.GFX3D_Renderer_MultisampleSize = (config.multisampling) ? 4 : 0;
#endif #endif
} }
// End: OK Response Block // End: OK Response Block
@ -3411,7 +3412,7 @@ common_gtk_main( class configured_features *my_config)
} }
CommonSettings.GFX3D_HighResolutionInterpolateColor = config.highColorInterpolation; CommonSettings.GFX3D_HighResolutionInterpolateColor = config.highColorInterpolation;
CommonSettings.GFX3D_Renderer_Multisample = config.multisampling; CommonSettings.GFX3D_Renderer_MultisampleSize = (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 ||