From c50ea6a63fb76f4111e305048788071dd0541730 Mon Sep 17 00:00:00 2001
From: f21red <54341442+f21red@users.noreply.github.com>
Date: Sat, 5 Oct 2019 20:24:32 -0500
Subject: [PATCH 1/2] libretro: sgb color correction

---
 libretro/libretro.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libretro/libretro.c b/libretro/libretro.c
index e075b2c..8c00ac5 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -486,7 +486,7 @@ static void check_variables()
     {
         var.key = "sameboy_color_correction_mode";
         var.value = NULL;
-        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gameboy[0]))
+        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
         {
             if (strcmp(var.value, "off") == 0)
                 GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_DISABLED);
@@ -540,7 +540,7 @@ static void check_variables()
     {
         var.key = "sameboy_color_correction_mode_1";
         var.value = NULL;
-        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gameboy[0]))
+        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
         {
             if (strcmp(var.value, "off") == 0)
                 GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_DISABLED);
@@ -554,7 +554,7 @@ static void check_variables()
 
         var.key = "sameboy_color_correction_mode_2";
         var.value = NULL;
-        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gameboy[1]))
+        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
         {
             if (strcmp(var.value, "off") == 0)
                 GB_set_color_correction_mode(&gameboy[1], GB_COLOR_CORRECTION_DISABLED);

From 0a7a0ca5fe28e34e479411d00c0ce3bc79c69334 Mon Sep 17 00:00:00 2001
From: f21red <54341442+f21red@users.noreply.github.com>
Date: Sat, 5 Oct 2019 20:51:59 -0500
Subject: [PATCH 2/2] libretro: sgb border option

---
 libretro/libretro.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/libretro/libretro.c b/libretro/libretro.c
index 8c00ac5..54c7906 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -92,6 +92,7 @@ static unsigned emulated_devices = 1;
 static bool initialized = false;
 static unsigned screen_layout = 0;
 static unsigned audio_out = 0;
+static unsigned sgb_border = 1;
 
 static bool geometry_updated = false;
 static bool link_cable_emulation = false;
@@ -204,6 +205,7 @@ static const struct retro_variable vars_single[] = {
     { "sameboy_color_correction_mode", "Color correction; off|correct curves|emulate hardware|preserve brightness" },
     { "sameboy_high_pass_filter_mode", "High-pass filter; off|accurate|remove dc offset" },
     { "sameboy_model", "Emulated model; Auto|Game Boy|Game Boy Color|Game Boy Advance|Super Game Boy|Super Game Boy 2" },
+    { "sameboy_border", "Super Game Boy border; enabled|disabled" },
     { NULL }
 };
 
@@ -535,6 +537,16 @@ static void check_variables()
                 init_for_current_model(0);
             }
         }
+
+        var.key = "sameboy_border";
+        var.value = NULL;
+        if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+        {
+            if (strcmp(var.value, "enabled") == 0)
+                sgb_border = 1;
+            else if (strcmp(var.value, "disabled") == 0)
+                sgb_border = 0;
+        }
     }
     else
     {
@@ -880,8 +892,15 @@ void retro_run(void)
     }
     else
     {
-        if (model[0] == MODEL_SGB || model[0] == MODEL_SGB2)
-            video_cb(frame_buf, SGB_VIDEO_WIDTH, SGB_VIDEO_HEIGHT, SGB_VIDEO_WIDTH * sizeof(uint32_t));
+        if (model[0] == MODEL_SGB || model[0] == MODEL_SGB2) {
+            if (sgb_border == 1)
+                video_cb(frame_buf, SGB_VIDEO_WIDTH, SGB_VIDEO_HEIGHT, SGB_VIDEO_WIDTH * sizeof(uint32_t));
+            else {
+                int crop = SGB_VIDEO_WIDTH * ((SGB_VIDEO_HEIGHT - VIDEO_HEIGHT) / 2) + ((SGB_VIDEO_WIDTH - VIDEO_WIDTH) / 2);
+
+                video_cb(frame_buf + crop, VIDEO_WIDTH, VIDEO_HEIGHT, SGB_VIDEO_WIDTH * sizeof(uint32_t));
+            }
+        }
         else
             video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT, VIDEO_WIDTH * sizeof(uint32_t));
     }