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

gsdx linux: add a config box for swthreads and fix a bad copy paste 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4542 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-04-07 12:30:29 +00:00
parent e1592788c0
commit d130a6f3df
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/GSdx/GSLinuxDialog.cpp
View File

@ -48,6 +48,7 @@ bool RunLinuxDialog()
GtkWidget *render_label, *render_combo_box; GtkWidget *render_label, *render_combo_box;
GtkWidget *interlace_label, *interlace_combo_box; GtkWidget *interlace_label, *interlace_combo_box;
GtkWidget *aspect_label, *aspect_combo_box; GtkWidget *aspect_label, *aspect_combo_box;
GtkWidget *swthreads_label, *swthreads_text;
GtkWidget *filter_check, *logz_check, *paltex_check, *fba_check, *aa_check, *win_check; GtkWidget *filter_check, *logz_check, *paltex_check, *fba_check, *aa_check, *win_check;
int return_value; int return_value;
@ -132,10 +133,21 @@ bool RunLinuxDialog()
gtk_combo_box_append_text(GTK_COMBO_BOX(aspect_combo_box), label.c_str()); gtk_combo_box_append_text(GTK_COMBO_BOX(aspect_combo_box), label.c_str());
} }
gtk_combo_box_set_active(GTK_COMBO_BOX(aspect_combo_box), 0); gtk_combo_box_set_active(GTK_COMBO_BOX(aspect_combo_box), 0);
gtk_container_add(GTK_CONTAINER(main_box), aspect_label); gtk_container_add(GTK_CONTAINER(main_box), aspect_label);
gtk_container_add(GTK_CONTAINER(main_box), aspect_combo_box); gtk_container_add(GTK_CONTAINER(main_box), aspect_combo_box);
swthreads_label = gtk_label_new("Software renderer threads:");
swthreads_text = gtk_entry_new();
char buf[5];
sprintf(buf, "%d", theApp.GetConfig("swthreads", 1));
gtk_entry_set_text(GTK_ENTRY(swthreads_text), buf);
gtk_container_add(GTK_CONTAINER(main_box), swthreads_label);
gtk_container_add(GTK_CONTAINER(main_box), swthreads_text);
filter_check = gtk_check_button_new_with_label("Texture Filtering"); filter_check = gtk_check_button_new_with_label("Texture Filtering");
logz_check = gtk_check_button_new_with_label("Logarithmic Z"); logz_check = gtk_check_button_new_with_label("Logarithmic Z");
@ -193,6 +205,8 @@ bool RunLinuxDialog()
} }
theApp.SetConfig("swthreads", atoi((char*)gtk_entry_get_text(GTK_ENTRY(swthreads_text))) );
theApp.SetConfig("filter", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_check))); theApp.SetConfig("filter", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_check)));
theApp.SetConfig("logz", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(logz_check))); theApp.SetConfig("logz", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(logz_check)));
theApp.SetConfig("paltex", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(paltex_check))); theApp.SetConfig("paltex", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(paltex_check)));

2
plugins/GSdx/GSdx.cpp
View File

@ -170,7 +170,7 @@ void GSdxApp::BuildConfigurationMap(const char* lpFileName)
char key[255]; char key[255];
FILE* f = fopen(lpFileName, "r"); FILE* f = fopen(lpFileName, "r");
if (f == NULL) return false; // FIXME print a nice message if (f == NULL) return; // FIXME print a nice message
while( fscanf(f, "%s = %s\n", key, value) != EOF ) { while( fscanf(f, "%s = %s\n", key, value) != EOF ) {
std::string key_s(key); std::string key_s(key);