From 07045d1f4a47ec2693b7e51bb209e693fecfc500 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 27 Mar 2010 05:40:58 +0000 Subject: [PATCH] zzogl-pg: 8x AA != 16x AA. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2784 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/zzogl-pg/opengl/Linux/Linux.cpp | 13 +------------ plugins/zzogl-pg/opengl/Linux/Linux.h | 11 ++++++++--- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/plugins/zzogl-pg/opengl/Linux/Linux.cpp b/plugins/zzogl-pg/opengl/Linux/Linux.cpp index 327c74b938..cb47a23021 100644 --- a/plugins/zzogl-pg/opengl/Linux/Linux.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Linux.cpp @@ -27,17 +27,6 @@ #include -GtkWidget *Conf, *Logging, *About; -GList *fresl, *wresl, *cachesizel, *codecl, *filtersl; - -static int prevbilinearfilter; - -struct confOptsStruct -{ - int value; - const char *desc; -} confOpts; - static map mapConfOpts; void CALLBACK GSkeyEvent(keyEvent *ev) @@ -250,7 +239,7 @@ void DisplayDialog() gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "2X - Anti-Aliasing x 2"); gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "4X - Anti-Aliasing x 4"); gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "8X - Anti-Aliasing x 8"); - gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "8X - Anti-Aliasing x 8"); + gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "16X - Anti-Aliasing x 16"); gtk_combo_box_set_active(GTK_COMBO_BOX(aa_box), conf.aa); wireframe_check = gtk_check_button_new_with_label("Wireframe Rendering(Shift + F6)"); diff --git a/plugins/zzogl-pg/opengl/Linux/Linux.h b/plugins/zzogl-pg/opengl/Linux/Linux.h index cfead3b7ee..3d6699859c 100644 --- a/plugins/zzogl-pg/opengl/Linux/Linux.h +++ b/plugins/zzogl-pg/opengl/Linux/Linux.h @@ -18,9 +18,14 @@ #ifndef __LINUX_H__ #define __LINUX_H__ -#endif + +struct confOptsStruct +{ + int value; + const char *desc; +} confOpts; + void OnToggle_advopts(GtkCellRendererToggle *cell, gchar *path, gpointer user_data); -#define is_checked(main_widget, widget_name) (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(main_widget, widget_name)))) -#define set_checked(main_widget,widget_name, state) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(lookup_widget(main_widget, widget_name)), state) +#endif