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

sdl: print error when opengl/scalers are both enabled

This commit is contained in:
punkrockguy318 2015-09-20 23:29:02 +00:00
parent adca6a2e67
commit 179b52ba31
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/src/drivers/sdl/gui.cpp
View File

@ -833,6 +833,15 @@ void resizeGtkWindow()
void setScaler(GtkWidget* w, gpointer p) void setScaler(GtkWidget* w, gpointer p)
{ {
int scaler = gtk_combo_box_get_active(GTK_COMBO_BOX(w)); int scaler = gtk_combo_box_get_active(GTK_COMBO_BOX(w));
int opengl;
g_config->getOption("SDL.OpenGL", &opengl);
if(opengl && scaler)
{
FCEUD_PrintError("Scalers not supported in OpenGL mode.");
gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0);
return;
}
g_config->setOption("SDL.SpecialFilter", scaler); g_config->setOption("SDL.SpecialFilter", scaler);
// 1=hq2x 2=Scale2x 3=NTSC2x 4=hq3x 5=Scale3x 6=Prescale2x 7=Prescale3x 8=Prescale4x 9=pal // 1=hq2x 2=Scale2x 3=NTSC2x 4=hq3x 5=Scale3x 6=Prescale2x 7=Prescale3x 8=Prescale4x 9=pal
@ -890,6 +899,15 @@ int setYscale(GtkWidget* w, gpointer p)
#ifdef OPENGL #ifdef OPENGL
void setGl(GtkWidget* w, gpointer p) void setGl(GtkWidget* w, gpointer p)
{ {
int scaler;
int opengl = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
g_config->getOption("SDL.SpecialFilter", &scaler);
if(scaler && opengl)
{
FCEUD_PrintError("Scalers not supported in OpenGL mode.");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), 0);
return;
}
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
g_config->setOption("SDL.OpenGL", 1); g_config->setOption("SDL.OpenGL", 1);
else else

12
trunk/src/drivers/sdl/sdl.cpp
View File

@ -627,6 +627,18 @@ int main(int argc, char *argv[])
// update the input devices // update the input devices
UpdateInput(g_config); UpdateInput(g_config);
// check if opengl is enabled with a scaler and display an error and bail
int opengl;
int scaler;
g_config->getOption("SDL.OpenGL", &opengl);
g_config->getOption("SDL.SpecialFilter", &scaler);
if(opengl && scaler)
{
printf("Scalers are not supported in OpenGL mode. Terminating.\n");
exit(2);
}
// check for a .fcm file to convert to .fm2 // check for a .fcm file to convert to .fm2
g_config->getOption ("SDL.FCMConvert", &s); g_config->getOption ("SDL.FCMConvert", &s);
g_config->setOption ("SDL.FCMConvert", ""); g_config->setOption ("SDL.FCMConvert", "");