From a96eefdf0f10a9a051e65f6e88a24dc3abe40fc5 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Mon, 17 Jul 2017 17:32:35 +0300 Subject: * Bring pluing Linux(gtk) interfaces up to date. --- plugins/peopsxgl/Makefile.am | 26 +- plugins/peopsxgl/gpucfg/main.c | 3 +- plugins/peopsxgl/gpucfg/peopsxgl.ui | 646 +++++++++++++++++------------------- 3 files changed, 329 insertions(+), 346 deletions(-) mode change 100755 => 100644 plugins/peopsxgl/gpucfg/peopsxgl.ui (limited to 'plugins/peopsxgl') diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index 9bcd6bea..a37643e6 100755 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -26,9 +26,29 @@ libpeopsxgl_la_LDFLAGS = -module -avoid-version libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm bin_PROGRAMS = cfgpeopsxgl -cfgpeopsxgl_SOURCES = gpucfg/main.c +cfgpeopsxgl_SOURCES = gpucfg/main.c GtkResources.c GtkResources.h cfgpeopsxgl_LDADD = $(GTK3_LIBS) -glade_DATA = gpucfg/peopsxgl.ui -gladedir = $(datadir)/psemu/ +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + peopsxgl.ui + + +endef + +peopsxgl.gresource.xml: + $(file >$@,$(gresource_xml)) +peopsxgl_gresource: peopsxgl.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg --generate-dependencies $(srcdir)/$<) +GtkResources.c: peopsxgl.gresource.xml $(peopsxgl_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-source --c-name peopsxgl $< +GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-header --c-name peopsxgl $< + + +#glade_DATA = gpucfg/peopsxgl.ui +#gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c index 812ec5f9..b29c85fb 100755 --- a/plugins/peopsxgl/gpucfg/main.c +++ b/plugins/peopsxgl/gpucfg/main.c @@ -257,7 +257,7 @@ int main( int argc, char **argv ) { builder = gtk_builder_new(); // Load the glade file - if ( !gtk_builder_add_from_file( builder, DATADIR "peopsxgl.ui", &error ) ) { + if ( !gtk_builder_add_from_resource( builder, "/org/pcsxr/peopsxgl/peopsxgl.ui", &error ) ) { g_warning( "%s", error->message ); g_free( error ); return( 1 ); @@ -269,6 +269,7 @@ int main( int argc, char **argv ) { const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL}; widget = gtk_about_dialog_new(); + gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(widget), "help-about"); gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.18"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors); diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui old mode 100755 new mode 100644 index 895c8d45..c53a9852 --- a/plugins/peopsxgl/gpucfg/peopsxgl.ui +++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui @@ -1,6 +1,170 @@ + - + + + 20 + 200 + 60 + 1 + 10 + + + + + + + + + Emulated VRam - Ok most times + + + Gfx card buffer reads + + + Gfx card buffer moves + + + Gfx card buffer reads and moves + + + Full Software (FVP) + + + + + + + + + + + Emulated VRam - Needs FVP + + + Black - Fast, no effects + + + Gfx card buffer - Can be slow + + + Gfx card and soft - Slow + + + + + + + + + + + None - Fastest, most glitches + + + Minimum - Missing screens + + + Standard - OK for most games + + + Enhanced - Shows more stuff + + + Extended - Causing garbage + + + + + + + + + + + None (Standard) + + + 2xSaI (Much vram needed) + + + Scaled (Needs tex filtering) + + + + + + + + + + + None + + + Standard - Glitches will happen + + + Extended - No black borders + + + Standard without sprites - Unfiltered 2D + + + Extended without sprites - Unfiltered 2D + + + Standard + smoothed sprites + + + Extended + smoothed sprites + + + + + + + + + + + Don't care - Use driver's default textures + + + 4444 - Fast, but less colorful + + + 5551 - Nice colors, bad transparency + + + 8888 - Best colors, more ram needed + + + BGR8888 - Faster on some cards + + + + + -1 + 255 + 1 + 10 + + + 1024 + 1 + 10 + + + 9999 + 1 + 10 + + + 9999 + 1 + 10 + False 5 @@ -14,24 +178,94 @@ False vertical 2 + + + True + False + end + + + Fast + True + True + True + Autoconfigure for fast display + + + False + False + 0 + True + + + + + Beautiful + True + True + True + Auto configure for beautiful display + + + False + False + 1 + True + + + + + gtk-ok + True + True + True + True + + + False + False + 2 + + + + + gtk-cancel + True + True + True + True + + + False + False + 3 + + + + + False + True + end + 0 + + True True - + True False 10 + vertical 5 - + True False - 2 - 2 - 5 5 + 5 True @@ -42,9 +276,7 @@ 1 - 2 - - + 0 @@ -57,37 +289,31 @@ 1 - 2 1 - 2 - - True False - 0 Width: + 0 - - + 0 + 0 True False - 0 Height: + 0 + 0 1 - 2 - - @@ -170,49 +396,53 @@ - + True False 10 + vertical 5 - + True False - 3 - 2 - 5 5 + 5 + True True False - 0 Quality: + 0 + + 0 + 0 + True False - 0 Filtering: + 0 + 0 1 - 2 True False - 0 HiRes Tex: + 0 + 0 2 - 3 @@ -229,7 +459,7 @@ 1 - 2 + 0 @@ -246,9 +476,7 @@ 1 - 2 1 - 2 @@ -265,9 +493,7 @@ 1 - 2 2 - 3 @@ -278,7 +504,7 @@ - + True False 5 @@ -286,8 +512,8 @@ True False - 0 VRam size in MBytes (0..1024, 0=auto): + 0 False @@ -333,10 +559,11 @@ - + True False 10 + vertical 5 @@ -374,9 +601,10 @@ False 20 - + True False + vertical 5 @@ -396,7 +624,7 @@ - + True False 5 @@ -490,49 +718,53 @@ - + True False 10 + vertical 5 - + True False - 3 - 2 - 5 5 + 5 + True True False - 0 Offscreen drawing: + 0 + + 0 + 0 + True False - 0 Framebuffer textures: + 0 + 0 1 - 2 True False - 0 Framebuffer access: + 0 + 0 2 - 3 @@ -549,7 +781,7 @@ 1 - 2 + 0 @@ -566,9 +798,7 @@ 1 - 2 1 - 2 @@ -585,9 +815,7 @@ 1 - 2 2 - 3 @@ -659,13 +887,14 @@ - + True False 10 + vertical 5 - + True False 5 @@ -826,10 +1055,11 @@ - + True False 10 + vertical 5 @@ -852,13 +1082,12 @@ False 20 - + True False - 9 - 2 - 5 5 + 5 + True Battle cursor (FF7) @@ -869,7 +1098,8 @@ True - + 0 + 0 @@ -883,8 +1113,7 @@ 1 - 2 - + 0 @@ -897,9 +1126,8 @@ True + 0 1 - 2 - @@ -912,9 +1140,8 @@ True + 0 2 - 3 - @@ -927,9 +1154,8 @@ True + 0 3 - 4 - @@ -942,9 +1168,8 @@ True + 0 4 - 5 - @@ -957,9 +1182,8 @@ True + 0 5 - 6 - @@ -972,9 +1196,8 @@ True + 0 6 - 7 - @@ -987,9 +1210,8 @@ True + 0 7 - 8 - @@ -1002,9 +1224,8 @@ True + 0 8 - 9 - @@ -1018,10 +1239,7 @@ 1 - 2 1 - 2 - @@ -1035,10 +1253,7 @@ 1 - 2 2 - 3 - @@ -1052,10 +1267,7 @@ 1 - 2 3 - 4 - @@ -1069,10 +1281,7 @@ 1 - 2 4 - 5 - @@ -1086,10 +1295,7 @@ 1 - 2 5 - 6 - @@ -1103,16 +1309,12 @@ 1 - 2 6 - 7 - Unused - True False True False @@ -1121,10 +1323,7 @@ 1 - 2 - 7 - 8 - + 8 @@ -1138,10 +1337,7 @@ 1 - 2 - 8 - 9 - + 7 @@ -1176,77 +1372,6 @@ 0 - - - True - False - end - - - Fast - True - True - True - Autoconfigure for fast display - - - False - False - 0 - True - - - - - Beautiful - True - True - True - Auto configure for beautiful display - - - False - False - 1 - True - - - - - gtk-ok - True - True - True - True - - - False - False - 2 - - - - - gtk-cancel - True - True - True - True - - - False - False - 3 - - - - - False - True - end - 0 - - @@ -1256,167 +1381,4 @@ btnCancel - - 20 - 200 - 60 - 1 - 10 - - - - - - - - - Emulated VRam - Ok most times - - - Gfx card buffer reads - - - Gfx card buffer moves - - - Gfx card buffer reads and moves - - - Full Software (FVP) - - - - - - - - - - - Emulated VRam - Needs FVP - - - Black - Fast, no effects - - - Gfx card buffer - Can be slow - - - Gfx card and soft - Slow - - - - - - - - - - - None - Fastest, most glitches - - - Minimum - Missing screens - - - Standard - OK for most games - - - Enhanced - Shows more stuff - - - Extended - Causing garbage - - - - - - - - - - - None (Standard) - - - 2xSaI (Much vram needed) - - - Scaled (Needs tex filtering) - - - - - - - - - - - None - - - Standard - Glitches will happen - - - Extended - No black borders - - - Standard without sprites - Unfiltered 2D - - - Extended without sprites - Unfiltered 2D - - - Standard + smoothed sprites - - - Extended + smoothed sprites - - - - - - - - - - - Don't care - Use driver's default textures - - - 4444 - Fast, but less colorful - - - 5551 - Nice colors, bad transparency - - - 8888 - Best colors, more ram needed - - - BGR8888 - Faster on some cards - - - - - -1 - 255 - 1 - 10 - - - 1024 - 1 - 10 - - - 9999 - 1 - 10 - - - 9999 - 1 - 10 - -- cgit v1.2.3