From 2e4938601a3628808c0be75419e8bc6809e169af Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 17 Jul 2020 16:34:11 +0200
Subject: [PATCH] Cleanups

---
 gfx/drivers_context/orbis_ctx.c  |  1 +
 gfx/drivers_context/osmesa_ctx.c | 33 ++++++--------------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/gfx/drivers_context/orbis_ctx.c b/gfx/drivers_context/orbis_ctx.c
index a11d0ba6fd..398771b702 100644
--- a/gfx/drivers_context/orbis_ctx.c
+++ b/gfx/drivers_context/orbis_ctx.c
@@ -28,6 +28,7 @@
 
 static enum gfx_ctx_api ctx_orbis_api = GFX_CTX_OPENGL_API;
 
+/* TODO/FIXME - global reference */
 extern bool platform_orbis_has_focus;
 
 void orbis_ctx_destroy(void *data)
diff --git a/gfx/drivers_context/osmesa_ctx.c b/gfx/drivers_context/osmesa_ctx.c
index 3ca0d1b6ea..193c763065 100644
--- a/gfx/drivers_context/osmesa_ctx.c
+++ b/gfx/drivers_context/osmesa_ctx.c
@@ -41,15 +41,15 @@
 #define HAVE_OSMESA_CREATE_CONTEXT_EXT 1
 #endif
 
+/* TODO/FIXME - static globals */
 static bool           g_osmesa_profile = OSMESA_COMPAT_PROFILE;
 static int            g_osmesa_major   = 2;
 static int            g_osmesa_minor   = 1;
+
 static const int      g_osmesa_format  = OSMESA_RGBA;
 static const int      g_osmesa_bpp     = 4;
 static const char    *g_osmesa_fifo    = "/tmp/osmesa-retroarch.sock";
 
-static enum gfx_ctx_api osmesa_api     = GFX_CTX_NONE;
-
 typedef struct gfx_osmesa_ctx_data
 {
    uint8_t *screen;
@@ -213,7 +213,7 @@ static void osmesa_ctx_destroy(void *data)
 
 static enum gfx_ctx_api osmesa_ctx_get_api(void *data)
 {
-   return osmesa_api;
+   return GFX_CTX_OPENGL_API;
 }
 
 static bool osmesa_ctx_bind_api(void *data,
@@ -224,10 +224,9 @@ static bool osmesa_ctx_bind_api(void *data,
       return false;
 
    /* Use version 2.1 by default */
-   osmesa_api       = api;
-   g_osmesa_major   = 2;
-   g_osmesa_minor   = 1;
-   g_osmesa_profile = OSMESA_COMPAT_PROFILE;
+   g_osmesa_major    = 2;
+   g_osmesa_minor    = 1;
+   g_osmesa_profile  = OSMESA_COMPAT_PROFILE;
 
    if (major)
    {
@@ -275,27 +274,7 @@ static bool osmesa_ctx_set_video_mode(void *data,
    osmesa->screen = screen;
 
    if (!osmesa->socket)
-   {
-#if 0
-      unlink(g_osmesa_fifo);
-      if (mkfifo(g_osmesa_fifo, 0666) == 0)
-      {
-         RARCH_WARN("[osmesa]: Please connect the sink to the fifo...\n");
-         RARCH_WARN("[osmesa]: Picture size is %ux%u\n", width, height);
-         osmesa->socket = open(g_osmesa_fifo, O_WRONLY);
-
-         if (osmesa->socket)
-            RARCH_WARN("[osmesa]: Initialized fifo at %s\n", g_osmesa_fifo);
-      }
-
-      if (!osmesa->socket || osmesa->socket < 0)
-      {
-         unlink(g_osmesa_fifo);
-         RARCH_WARN("[osmesa]: Failed to initialize fifo: %s\n", strerror(errno));
-      }
-#endif
       osmesa_fifo_open(osmesa);
-   }
 
    return true;
 }