From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Tue, 30 Jul 2019 02:03:04 +0000 (+0800)
Subject: Make advanced gpu options target actual gpu plugin used
X-Git-Tag: r24l~711^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d17de264fd31d662d4580a5f4bf268fa9ebd42a;hp=ef2683f1cae601159513afc7a94e0af0bb4bb055;p=pcsx_rearmed.git

Make advanced gpu options target actual gpu plugin used

- In the case of IOS, the core uses UNAI but can be built with dynarec or interpreter. Other platform does as well. So gpu-specific  defines are added for actual  gpu plugin used and compiled and then the specific gpu-only core options are shown or hidden based on this #define
---

diff --git a/Makefile b/Makefile
index 7f8356b1..06e4fccf 100644
--- a/Makefile
+++ b/Makefile
@@ -136,17 +136,20 @@ endif
 # builtin gpu
 OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o
 ifeq "$(BUILTIN_GPU)" "neon"
+CFLAGS += -DGPU_NEON
 OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o
 plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
 plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c
 endif
 ifeq "$(BUILTIN_GPU)" "peops"
+CFLAGS += -DGPU_PEOPS
 # note: code is not safe for strict-aliasing? (Castlevania problems)
 plugins/dfxvideo/gpulib_if.o: CFLAGS += -fno-strict-aliasing
 plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c
 OBJS += plugins/dfxvideo/gpulib_if.o
 endif
 ifeq "$(BUILTIN_GPU)" "unai"
+CFLAGS += -DGPU_UNAI
 OBJS += plugins/gpu_unai/gpulib_if.o
 ifeq "$(ARCH)" "arm"
 OBJS += plugins/gpu_unai/gpu_arm.o
diff --git a/frontend/libretro.c b/frontend/libretro.c
index 45c4c9c4..86cd34e2 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1633,7 +1633,7 @@ static void update_variables(bool in_flight)
    }
 #endif
 
-#ifdef DRC_DISABLE
+#ifdef GPU_PEOPS
    var.value = "NULL";
    var.key = "pcsx_rearmed_gpu_peops_fix_0";
 
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index e6b5e72c..680b252a 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -421,11 +421,11 @@ struct retro_core_option_definition option_defs_us[] = {
    },
 
    /* GPU PEOPS OPTIONS */
-#ifdef DRC_DISABLE
+#ifdef GPU_PEOPS
    {
       "pcsx_rearmed_show_gpu_peops_settings",
-      "Show Advance GPU Settings",
-      "Enable or disable various GPU fixes. A core restart might be needed for settings to take effect. NOTE: Quick Menu must be toggled for this setting to take effect.",
+      "Advanced GPU P.E.Op.S. Settings",
+      "Shows or hides advanced GPU plugin settings. NOTE: Quick Menu must be toggled for this setting to take effect.",
       {
          { "disabled", NULL },
          { "enabled",  NULL },