From 4cfc568dce10c4ff9a476e229c56b17f8f1ed678 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 1 Nov 2023 18:47:16 +0200 Subject: [PATCH] rename gpu_senquack to gpu_unai to reduce the pain of syncing with libretro --- Makefile | 8 ++-- configure | 4 +- frontend/main.c | 12 +++--- frontend/menu.c | 38 +++++++++---------- frontend/plugin_lib.h | 2 +- plugins/{gpu_senquack => gpu_unai}/Makefile | 2 +- .../README_senquack.txt | 0 plugins/{gpu_senquack => gpu_unai}/debug.h | 0 plugins/{gpu_senquack => gpu_unai}/gpu.cpp | 0 plugins/{gpu_senquack => gpu_unai}/gpu.h | 0 plugins/{gpu_senquack => gpu_unai}/gpu_arm.S | 0 plugins/{gpu_senquack => gpu_unai}/gpu_arm.h | 0 plugins/{gpu_senquack => gpu_unai}/gpu_blit.h | 0 .../{gpu_senquack => gpu_unai}/gpu_command.h | 0 .../gpu_fixedpoint.h | 0 .../{gpu_senquack => gpu_unai}/gpu_inner.h | 0 .../gpu_inner_blend.h | 0 .../gpu_inner_blend_arm.h | 0 .../gpu_inner_blend_arm5.h | 0 .../gpu_inner_blend_arm7.h | 0 .../gpu_inner_light.h | 0 .../gpu_inner_light_arm.h | 0 .../gpu_inner_quantization.h | 0 .../gpu_raster_image.h | 0 .../gpu_raster_line.h | 0 .../gpu_raster_polygon.h | 0 .../gpu_raster_sprite.h | 0 .../{gpu_senquack => gpu_unai}/gpu_senquack.h | 0 .../{gpu_senquack => gpu_unai}/gpulib_if.cpp | 14 +++---- plugins/{gpu_senquack => gpu_unai}/port.h | 0 plugins/{gpu_senquack => gpu_unai}/profiler.h | 0 31 files changed, 40 insertions(+), 40 deletions(-) rename plugins/{gpu_senquack => gpu_unai}/Makefile (92%) rename plugins/{gpu_senquack => gpu_unai}/README_senquack.txt (100%) rename plugins/{gpu_senquack => gpu_unai}/debug.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu.cpp (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_arm.S (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_arm.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_blit.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_command.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_fixedpoint.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_blend.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_blend_arm.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_blend_arm5.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_blend_arm7.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_light.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_light_arm.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_inner_quantization.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_raster_image.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_raster_line.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_raster_polygon.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_raster_sprite.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpu_senquack.h (100%) rename plugins/{gpu_senquack => gpu_unai}/gpulib_if.cpp (97%) rename plugins/{gpu_senquack => gpu_unai}/port.h (100%) rename plugins/{gpu_senquack => gpu_unai}/profiler.h (100%) diff --git a/Makefile b/Makefile index 85886d0e..8cbf5c66 100644 --- a/Makefile +++ b/Makefile @@ -151,12 +151,12 @@ plugins/gpu_unai_old/gpulib_if.o: CFLAGS += -DREARMED -O3 CC_LINK = $(CXX) endif -ifeq "$(BUILTIN_GPU)" "senquack" -OBJS += plugins/gpu_senquack/gpulib_if.o +ifeq "$(BUILTIN_GPU)" "unai" +OBJS += plugins/gpu_unai/gpulib_if.o ifeq "$(ARCH)" "arm" -OBJS += plugins/gpu_senquack/gpu_arm.o +OBJS += plugins/gpu_unai/gpu_arm.o endif -plugins/gpu_senquack/gpulib_if.o: CFLAGS += -DREARMED -O3 +plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 CC_LINK = $(CXX) endif diff --git a/configure b/configure index 01f26b44..ac7af0e2 100755 --- a/configure +++ b/configure @@ -39,12 +39,12 @@ check_define_val() platform_list="generic pandora maemo caanoo libretro" platform="generic" -builtin_gpu_list="neon peops senquack unai_old" +builtin_gpu_list="neon peops unai unai_old" builtin_gpu="" sound_driver_list="oss alsa pulseaudio sdl libretro" sound_drivers="" plugins="plugins/spunull/spunull.so \ -plugins/dfxvideo/gpu_peops.so plugins/gpu_unai_old/gpu_unai_old.so plugins/gpu_senquack/gpu_senquack.so" +plugins/dfxvideo/gpu_peops.so plugins/gpu_unai_old/gpu_unai_old.so plugins/gpu_unai/gpu_unai.so" drc_cache_base="no" have_armv5="" have_armv6="" diff --git a/frontend/main.c b/frontend/main.c index 45e25815..cec1fbbf 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -142,12 +142,12 @@ void emu_set_default_config(void) pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0; pl_rearmed_cbs.gpu_peops.iUseDither = 0; pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; - pl_rearmed_cbs.gpu_senquack.ilace_force = 0; - pl_rearmed_cbs.gpu_senquack.pixel_skip = 0; - pl_rearmed_cbs.gpu_senquack.lighting = 1; - pl_rearmed_cbs.gpu_senquack.fast_lighting = 0; - pl_rearmed_cbs.gpu_senquack.blending = 1; - pl_rearmed_cbs.gpu_senquack.dithering = 0; + pl_rearmed_cbs.gpu_unai.ilace_force = 0; + pl_rearmed_cbs.gpu_unai.pixel_skip = 0; + pl_rearmed_cbs.gpu_unai.lighting = 1; + pl_rearmed_cbs.gpu_unai.fast_lighting = 0; + pl_rearmed_cbs.gpu_unai.blending = 1; + pl_rearmed_cbs.gpu_unai.dithering = 0; pl_rearmed_cbs.gpu_unai_old.abe_hack = pl_rearmed_cbs.gpu_unai_old.no_light = pl_rearmed_cbs.gpu_unai_old.no_blend = 0; diff --git a/frontend/menu.c b/frontend/menu.c index b2d50aad..9200e10d 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -438,13 +438,13 @@ static const struct { CE_INTVAL_P(gpu_unai_old.abe_hack), CE_INTVAL_P(gpu_unai_old.no_light), CE_INTVAL_P(gpu_unai_old.no_blend), - CE_INTVAL_P(gpu_senquack.ilace_force), - CE_INTVAL_P(gpu_senquack.pixel_skip), - CE_INTVAL_P(gpu_senquack.lighting), - CE_INTVAL_P(gpu_senquack.fast_lighting), - CE_INTVAL_P(gpu_senquack.blending), - CE_INTVAL_P(gpu_senquack.dithering), - CE_INTVAL_P(gpu_senquack.scale_hires), + CE_INTVAL_P(gpu_unai.ilace_force), + CE_INTVAL_P(gpu_unai.pixel_skip), + CE_INTVAL_P(gpu_unai.lighting), + CE_INTVAL_P(gpu_unai.fast_lighting), + CE_INTVAL_P(gpu_unai.blending), + CE_INTVAL_P(gpu_unai.dithering), + CE_INTVAL_P(gpu_unai.scale_hires), CE_INTVAL_P(gpu_neon.allow_interlace), CE_INTVAL_P(gpu_neon.enhancement_enable), CE_INTVAL_P(gpu_neon.enhancement_no_main), @@ -1400,21 +1400,21 @@ static int menu_loop_plugin_gpu_unai_old(int id, int keys) return 0; } -static menu_entry e_menu_plugin_gpu_senquack[] = +static menu_entry e_menu_plugin_gpu_unai[] = { - mee_onoff ("Interlace", 0, pl_rearmed_cbs.gpu_senquack.ilace_force, 1), - mee_onoff ("Dithering", 0, pl_rearmed_cbs.gpu_senquack.dithering, 1), - mee_onoff ("Lighting", 0, pl_rearmed_cbs.gpu_senquack.lighting, 1), - mee_onoff ("Fast lighting", 0, pl_rearmed_cbs.gpu_senquack.fast_lighting, 1), - mee_onoff ("Blending", 0, pl_rearmed_cbs.gpu_senquack.blending, 1), - mee_onoff ("Pixel skip", 0, pl_rearmed_cbs.gpu_senquack.pixel_skip, 1), + mee_onoff ("Interlace", 0, pl_rearmed_cbs.gpu_unai.ilace_force, 1), + mee_onoff ("Dithering", 0, pl_rearmed_cbs.gpu_unai.dithering, 1), + mee_onoff ("Lighting", 0, pl_rearmed_cbs.gpu_unai.lighting, 1), + mee_onoff ("Fast lighting", 0, pl_rearmed_cbs.gpu_unai.fast_lighting, 1), + mee_onoff ("Blending", 0, pl_rearmed_cbs.gpu_unai.blending, 1), + mee_onoff ("Pixel skip", 0, pl_rearmed_cbs.gpu_unai.pixel_skip, 1), mee_end, }; -static int menu_loop_plugin_gpu_senquack(int id, int keys) +static int menu_loop_plugin_gpu_unai(int id, int keys) { int sel = 0; - me_loop(e_menu_plugin_gpu_senquack, &sel); + me_loop(e_menu_plugin_gpu_unai, &sel); return 0; } @@ -1520,7 +1520,7 @@ static const char h_plugin_gpu[] = #endif "gpu_peops is Pete's soft GPU, slow but accurate\n" "gpu_unai_old is from old PCSX4ALL, fast but glitchy\n" - "gpu_senquack is more accurate but slower\n" + "gpu_unai is newer, more accurate but slower\n" "gpu_gles Pete's hw GPU, uses 3D chip but is glitchy\n" "must save config and reload the game if changed"; static const char h_plugin_spu[] = "spunull effectively disables sound\n" @@ -1528,7 +1528,7 @@ static const char h_plugin_spu[] = "spunull effectively disables sound\n" static const char h_gpu_peops[] = "Configure P.E.Op.S. SoftGL Driver V1.17"; static const char h_gpu_peopsgl[]= "Configure P.E.Op.S. MesaGL Driver V1.78"; static const char h_gpu_unai_old[] = "Configure Unai/PCSX4ALL Team GPU plugin (old)"; -static const char h_gpu_senquack[] = "Configure Unai/PCSX4ALL Senquack plugin"; +static const char h_gpu_unai[] = "Configure Unai/PCSX4ALL Team plugin (new)"; static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7"; static menu_entry e_menu_plugin_options[] = @@ -1541,7 +1541,7 @@ static menu_entry e_menu_plugin_options[] = #endif mee_handler_h ("Configure gpu_peops plugin", menu_loop_plugin_gpu_peops, h_gpu_peops), mee_handler_h ("Configure gpu_unai_old GPU plugin", menu_loop_plugin_gpu_unai_old, h_gpu_unai_old), - mee_handler_h ("Configure gpu_senquack GPU plugin", menu_loop_plugin_gpu_senquack, h_gpu_senquack), + mee_handler_h ("Configure gpu_unai GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai), mee_handler_h ("Configure gpu_gles GPU plugin", menu_loop_plugin_gpu_peopsgl, h_gpu_peopsgl), mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu), mee_end, diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h index cb1f4f77..6cfe5964 100644 --- a/frontend/plugin_lib.h +++ b/frontend/plugin_lib.h @@ -102,7 +102,7 @@ struct rearmed_cbs { int blending; int dithering; int scale_hires; - } gpu_senquack; + } gpu_unai; struct { int dwActFixes; int bDrawDither, iFilterType, iFrameTexType; diff --git a/plugins/gpu_senquack/Makefile b/plugins/gpu_unai/Makefile similarity index 92% rename from plugins/gpu_senquack/Makefile rename to plugins/gpu_unai/Makefile index c3be35b4..12c688e9 100644 --- a/plugins/gpu_senquack/Makefile +++ b/plugins/gpu_unai/Makefile @@ -15,5 +15,5 @@ SRC += gpu_arm.S endif #BIN_STANDALONE = gpuPCSX4ALL.so -BIN_GPULIB = gpu_senquack.so +BIN_GPULIB = gpu_unai.so include ../gpulib/gpulib.mak diff --git a/plugins/gpu_senquack/README_senquack.txt b/plugins/gpu_unai/README_senquack.txt similarity index 100% rename from plugins/gpu_senquack/README_senquack.txt rename to plugins/gpu_unai/README_senquack.txt diff --git a/plugins/gpu_senquack/debug.h b/plugins/gpu_unai/debug.h similarity index 100% rename from plugins/gpu_senquack/debug.h rename to plugins/gpu_unai/debug.h diff --git a/plugins/gpu_senquack/gpu.cpp b/plugins/gpu_unai/gpu.cpp similarity index 100% rename from plugins/gpu_senquack/gpu.cpp rename to plugins/gpu_unai/gpu.cpp diff --git a/plugins/gpu_senquack/gpu.h b/plugins/gpu_unai/gpu.h similarity index 100% rename from plugins/gpu_senquack/gpu.h rename to plugins/gpu_unai/gpu.h diff --git a/plugins/gpu_senquack/gpu_arm.S b/plugins/gpu_unai/gpu_arm.S similarity index 100% rename from plugins/gpu_senquack/gpu_arm.S rename to plugins/gpu_unai/gpu_arm.S diff --git a/plugins/gpu_senquack/gpu_arm.h b/plugins/gpu_unai/gpu_arm.h similarity index 100% rename from plugins/gpu_senquack/gpu_arm.h rename to plugins/gpu_unai/gpu_arm.h diff --git a/plugins/gpu_senquack/gpu_blit.h b/plugins/gpu_unai/gpu_blit.h similarity index 100% rename from plugins/gpu_senquack/gpu_blit.h rename to plugins/gpu_unai/gpu_blit.h diff --git a/plugins/gpu_senquack/gpu_command.h b/plugins/gpu_unai/gpu_command.h similarity index 100% rename from plugins/gpu_senquack/gpu_command.h rename to plugins/gpu_unai/gpu_command.h diff --git a/plugins/gpu_senquack/gpu_fixedpoint.h b/plugins/gpu_unai/gpu_fixedpoint.h similarity index 100% rename from plugins/gpu_senquack/gpu_fixedpoint.h rename to plugins/gpu_unai/gpu_fixedpoint.h diff --git a/plugins/gpu_senquack/gpu_inner.h b/plugins/gpu_unai/gpu_inner.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner.h rename to plugins/gpu_unai/gpu_inner.h diff --git a/plugins/gpu_senquack/gpu_inner_blend.h b/plugins/gpu_unai/gpu_inner_blend.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_blend.h rename to plugins/gpu_unai/gpu_inner_blend.h diff --git a/plugins/gpu_senquack/gpu_inner_blend_arm.h b/plugins/gpu_unai/gpu_inner_blend_arm.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_blend_arm.h rename to plugins/gpu_unai/gpu_inner_blend_arm.h diff --git a/plugins/gpu_senquack/gpu_inner_blend_arm5.h b/plugins/gpu_unai/gpu_inner_blend_arm5.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_blend_arm5.h rename to plugins/gpu_unai/gpu_inner_blend_arm5.h diff --git a/plugins/gpu_senquack/gpu_inner_blend_arm7.h b/plugins/gpu_unai/gpu_inner_blend_arm7.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_blend_arm7.h rename to plugins/gpu_unai/gpu_inner_blend_arm7.h diff --git a/plugins/gpu_senquack/gpu_inner_light.h b/plugins/gpu_unai/gpu_inner_light.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_light.h rename to plugins/gpu_unai/gpu_inner_light.h diff --git a/plugins/gpu_senquack/gpu_inner_light_arm.h b/plugins/gpu_unai/gpu_inner_light_arm.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_light_arm.h rename to plugins/gpu_unai/gpu_inner_light_arm.h diff --git a/plugins/gpu_senquack/gpu_inner_quantization.h b/plugins/gpu_unai/gpu_inner_quantization.h similarity index 100% rename from plugins/gpu_senquack/gpu_inner_quantization.h rename to plugins/gpu_unai/gpu_inner_quantization.h diff --git a/plugins/gpu_senquack/gpu_raster_image.h b/plugins/gpu_unai/gpu_raster_image.h similarity index 100% rename from plugins/gpu_senquack/gpu_raster_image.h rename to plugins/gpu_unai/gpu_raster_image.h diff --git a/plugins/gpu_senquack/gpu_raster_line.h b/plugins/gpu_unai/gpu_raster_line.h similarity index 100% rename from plugins/gpu_senquack/gpu_raster_line.h rename to plugins/gpu_unai/gpu_raster_line.h diff --git a/plugins/gpu_senquack/gpu_raster_polygon.h b/plugins/gpu_unai/gpu_raster_polygon.h similarity index 100% rename from plugins/gpu_senquack/gpu_raster_polygon.h rename to plugins/gpu_unai/gpu_raster_polygon.h diff --git a/plugins/gpu_senquack/gpu_raster_sprite.h b/plugins/gpu_unai/gpu_raster_sprite.h similarity index 100% rename from plugins/gpu_senquack/gpu_raster_sprite.h rename to plugins/gpu_unai/gpu_raster_sprite.h diff --git a/plugins/gpu_senquack/gpu_senquack.h b/plugins/gpu_unai/gpu_senquack.h similarity index 100% rename from plugins/gpu_senquack/gpu_senquack.h rename to plugins/gpu_unai/gpu_senquack.h diff --git a/plugins/gpu_senquack/gpulib_if.cpp b/plugins/gpu_unai/gpulib_if.cpp similarity index 97% rename from plugins/gpu_senquack/gpulib_if.cpp rename to plugins/gpu_unai/gpulib_if.cpp index e5a51aa5..7b148d4f 100644 --- a/plugins/gpu_senquack/gpulib_if.cpp +++ b/plugins/gpu_unai/gpulib_if.cpp @@ -635,13 +635,13 @@ void renderer_set_interlace(int enable, int is_odd) void renderer_set_config(const struct rearmed_cbs *cbs) { gpu_senquack.vram = (u16*)gpu.vram; - gpu_senquack.config.ilace_force = cbs->gpu_senquack.ilace_force; - gpu_senquack.config.pixel_skip = cbs->gpu_senquack.pixel_skip; - gpu_senquack.config.lighting = cbs->gpu_senquack.lighting; - gpu_senquack.config.fast_lighting = cbs->gpu_senquack.fast_lighting; - gpu_senquack.config.blending = cbs->gpu_senquack.blending; - gpu_senquack.config.dithering = cbs->gpu_senquack.dithering; - gpu_senquack.config.scale_hires = cbs->gpu_senquack.scale_hires; + gpu_senquack.config.ilace_force = cbs->gpu_unai.ilace_force; + gpu_senquack.config.pixel_skip = cbs->gpu_unai.pixel_skip; + gpu_senquack.config.lighting = cbs->gpu_unai.lighting; + gpu_senquack.config.fast_lighting = cbs->gpu_unai.fast_lighting; + gpu_senquack.config.blending = cbs->gpu_unai.blending; + gpu_senquack.config.dithering = cbs->gpu_unai.dithering; + gpu_senquack.config.scale_hires = cbs->gpu_unai.scale_hires; } // vim:shiftwidth=2:expandtab diff --git a/plugins/gpu_senquack/port.h b/plugins/gpu_unai/port.h similarity index 100% rename from plugins/gpu_senquack/port.h rename to plugins/gpu_unai/port.h diff --git a/plugins/gpu_senquack/profiler.h b/plugins/gpu_unai/profiler.h similarity index 100% rename from plugins/gpu_senquack/profiler.h rename to plugins/gpu_unai/profiler.h -- 2.39.5