From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Mon, 5 Aug 2019 01:46:37 +0000 (+0800)
Subject: Update advanced peops gpu core options
X-Git-Tag: r24l~704^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6713b6291a14f62ef2a348cb1d83e69b55a2be98;p=pcsx_rearmed.git

Update advanced peops gpu core options
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index bdf08293..192d6d06 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -134,6 +134,16 @@ static int snd_init(void){return 0;}
 static void snd_finish(void){}
 static int snd_busy(void){return 0;}
 
+#define GPU_PEOPS_ODD_EVEN_BIT         (1 << 0)
+#define GPU_PEOPS_EXPAND_SCREEN_WIDTH  (1 << 1)
+#define GPU_PEOPS_IGNORE_BRIGHTNESS    (1 << 2)
+#define GPU_PEOPS_DISABLE_COORD_CHECK  (1 << 3)
+#define GPU_PEOPS_LAZY_SCREEN_UPDATE   (1 << 6)
+#define GPU_PEOPS_OLD_FRAME_SKIP       (1 << 7)
+#define GPU_PEOPS_REPEATED_TRIANGLES   (1 << 8)
+#define GPU_PEOPS_QUADS_WITH_TRIANGLES (1 << 9)
+#define GPU_PEOPS_FAKE_BUSY_STATE      (1 << 10)
+
 static void init_memcard(char *mcd_data)
 {
 	unsigned off = 0;
@@ -1633,91 +1643,91 @@ static void update_variables(bool in_flight)
 
 #ifdef GPU_PEOPS
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_0";
+   var.key = "pcsx_rearmed_gpu_peops_odd_even_bit";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 0);
+         gpu_peops_fix |= GPU_PEOPS_ODD_EVEN_BIT;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_1";
+   var.key = "pcsx_rearmed_gpu_peops_expand_screen_width";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 1);
+         gpu_peops_fix |= GPU_PEOPS_EXPAND_SCREEN_WIDTH;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_2";
+   var.key = "pcsx_rearmed_gpu_peops_ignore_brightness";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 2);
+         gpu_peops_fix |= GPU_PEOPS_IGNORE_BRIGHTNESS;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_3";
+   var.key = "pcsx_rearmed_gpu_peops_disable_coord_check";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 3);
+         gpu_peops_fix |= GPU_PEOPS_DISABLE_COORD_CHECK;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_6";
+   var.key = "pcsx_rearmed_gpu_peops_lazy_screen_update";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 6);
+         gpu_peops_fix |= GPU_PEOPS_LAZY_SCREEN_UPDATE;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_7";
+   var.key = "pcsx_rearmed_gpu_peops_old_frame_skip";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 7);
+         gpu_peops_fix |= GPU_PEOPS_OLD_FRAME_SKIP;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_8";
+   var.key = "pcsx_rearmed_gpu_peops_repeated_triangles";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 8);
+         gpu_peops_fix |= GPU_PEOPS_REPEATED_TRIANGLES;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_9";
+   var.key = "pcsx_rearmed_gpu_peops_quads_with_triangles";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 9);
+         gpu_peops_fix |= GPU_PEOPS_QUADS_WITH_TRIANGLES;
    }
 
    var.value = "NULL";
-   var.key = "pcsx_rearmed_gpu_peops_fix_10";
+   var.key = "pcsx_rearmed_gpu_peops_fake_busy_state";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
       if (strcmp(var.value, "enabled") == 0)
-         gpu_peops_fix |= (1 << 10);
+         gpu_peops_fix |= GPU_PEOPS_FAKE_BUSY_STATE;
    }
 
    if (pl_rearmed_cbs.gpu_peops.dwActFixes != gpu_peops_fix)
       pl_rearmed_cbs.gpu_peops.dwActFixes = gpu_peops_fix;
 
 
-    /* Show/hide core options */
+   /* Show/hide core options */
 
    var.key = "pcsx_rearmed_show_gpu_peops_settings";
    var.value = NULL;
@@ -1734,16 +1744,16 @@ static void update_variables(bool in_flight)
       {
          unsigned i;
          struct retro_core_option_display option_display;
-         char gpu_peops_option[9][32] = {
-            "pcsx_rearmed_gpu_peops_fix_0",
-            "pcsx_rearmed_gpu_peops_fix_1",
-            "pcsx_rearmed_gpu_peops_fix_2",
-            "pcsx_rearmed_gpu_peops_fix_3",
-            "pcsx_rearmed_gpu_peops_fix_6",
-            "pcsx_rearmed_gpu_peops_fix_7",
-            "pcsx_rearmed_gpu_peops_fix_8",
-            "pcsx_rearmed_gpu_peops_fix_9",
-            "pcsx_rearmed_gpu_peops_fix_10",
+         char gpu_peops_option[9][45] = {
+            "pcsx_rearmed_gpu_peops_odd_even_bit",
+            "pcsx_rearmed_gpu_peops_expand_screen_width",
+            "pcsx_rearmed_gpu_peops_ignore_brightness",
+            "pcsx_rearmed_gpu_peops_disable_coord_check",
+            "pcsx_rearmed_gpu_peops_lazy_screen_update",
+            "pcsx_rearmed_gpu_peops_old_frame_skip",
+            "pcsx_rearmed_gpu_peops_repeated_triangles",
+            "pcsx_rearmed_gpu_peops_quads_with_triangles",
+            "pcsx_rearmed_gpu_peops_fake_busy_state",
          };
 
          option_display.visible = show_advanced_gpu_peops_settings;
@@ -2247,7 +2257,7 @@ void retro_init(void)
 	cycle_multiplier = 200;
 #endif
 	pl_rearmed_cbs.gpu_peops.iUseDither = 1;
-   pl_rearmed_cbs.gpu_peops.dwActFixes = 1 << 7;
+	pl_rearmed_cbs.gpu_peops.dwActFixes = GPU_PEOPS_OLD_FRAME_SKIP;
 	spu_config.iUseFixedUpdates = 1;
 
 	SaveFuncs.open = save_open;
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index f0bd9023..5d50e502 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -434,7 +434,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_0",
+      "pcsx_rearmed_gpu_peops_odd_even_bit",
       "(GPU) Odd/Even Bit Hack",
       "Needed for Chrono Cross.",
       {
@@ -445,7 +445,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_1",
+      "pcsx_rearmed_gpu_peops_expand_screen_width",
       "(GPU) Expand Screen Width",
       "Capcom fighting games",
       {
@@ -456,7 +456,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_2",
+      "pcsx_rearmed_gpu_peops_ignore_brightness",
       "(GPU) Ignore Brightness Color",
       "Black screens in Lunar Silver Star Story games",
       {
@@ -467,7 +467,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_3",
+      "pcsx_rearmed_gpu_peops_disable_coord_check",
       "(GPU) Disable Coordinate Check",
       "Compatibility mode",
       {
@@ -478,7 +478,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_6",
+      "pcsx_rearmed_gpu_peops_lazy_screen_update",
       "(GPU) Lazy Screen Update",
       "Pandemonium 2",
       {
@@ -489,7 +489,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_7",
+      "pcsx_rearmed_gpu_peops_old_frame_skip",
       "(GPU) Old Frame Skipping",
       "Skip every second frame",
       {
@@ -500,7 +500,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "enabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_8",
+      "pcsx_rearmed_gpu_peops_repeated_triangles",
       "(GPU) Repeated Flat Tex Triangles",
       "Needed by Star Wars: Dark Forces",
       {
@@ -511,7 +511,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_9",
+      "pcsx_rearmed_gpu_peops_quads_with_triangles",
       "(GPU) Draw Quads with Triangles",
       "Better g-colors, worse textures",
       {
@@ -522,7 +522,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "disabled",
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_10",
+      "pcsx_rearmed_gpu_peops_fake_busy_state",
       "(GPU) Fake 'Gpu Busy' States",
       "Toggle busy flags after drawing",
       {
@@ -996,7 +996,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_0",
+      "pcsx_rearmed_gpu_peops_odd_even_bit",
       "(GPU) Odd/Even Bit Hack",
       "Chrono Cross için gerekli.",
       {
@@ -1005,7 +1005,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_1",
+      "pcsx_rearmed_gpu_peops_expand_screen_width",
       "(GPU) Ekran Genişliğini Genişlet",
       "Capcom dövüş oyunları",
       {
@@ -1014,7 +1014,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_2",
+      "pcsx_rearmed_gpu_peops_ignore_brightness",
       "(GPU) Parlaklık Rengini Yoksay",
       "Lunar Silver Star Story oyunlarında siyah ekran",
       {
@@ -1023,7 +1023,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_3",
+      "pcsx_rearmed_gpu_peops_disable_coord_check",
       "(GPU) Koordinat Kontrolünü Devre Dışı Bırak",
       "Uyumluluk modu",
       {
@@ -1032,7 +1032,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_6",
+      "pcsx_rearmed_gpu_peops_lazy_screen_update",
       "(GPU) Tembel Ekran Güncellemesi",
       "Pandemonium 2",
       {
@@ -1041,7 +1041,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_7",
+      "pcsx_rearmed_gpu_peops_old_frame_skip",
       "(GPU) Eski Çerçeve Atlama",
       "Her ikinci kareyi atla",
       {
@@ -1050,7 +1050,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_8",
+      "pcsx_rearmed_gpu_peops_repeated_triangles",
       "(GPU) Tekrarlanan Düz Doku Üçgenleri",
       "Star Wars: Dark Forces için gerekli",
       {
@@ -1059,7 +1059,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_9",
+      "pcsx_rearmed_gpu_peops_quads_with_triangles",
       "(GPU) Üçgenler ile Dörtlü Çiz",
       "Daha iyi g renkler, daha kötü dokular",
       {
@@ -1068,7 +1068,7 @@ struct retro_core_option_definition option_defs_tr[] = {
       NULL
    },
    {
-      "pcsx_rearmed_gpu_peops_fix_10",
+      "pcsx_rearmed_gpu_peops_fake_busy_state",
       "(GPU) Sahte 'Gpu Meşgul' Konumları",
       "Çizimden sonra meşgul bayraklarını değiştir",
       {