From 4a09f66c7b6863971b29829e68c2fe49fab8ec0f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Aug 2019 22:04:27 +0200
Subject: [PATCH] (GL drivers) Cleanups

---
 gfx/drivers/gl.c      | 85 ++++++++++++-------------------------------
 gfx/drivers/gl_core.c | 18 ++++-----
 2 files changed, 31 insertions(+), 72 deletions(-)

diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 6047b0dcc6..a1cac8a630 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1425,42 +1425,6 @@ error:
    return false;
 }
 
-static void gl2_renderchain_bind_vao(
-      gl2_renderchain_data_t *chain)
-{
-#ifndef HAVE_OPENGLES
-   if (!chain)
-      return;
-   glBindVertexArray(chain->vao);
-#endif
-}
-
-static void gl2_renderchain_unbind_vao(void)
-{
-#ifndef HAVE_OPENGLES
-   glBindVertexArray(0);
-#endif
-}
-
-static void gl2_renderchain_new_vao(gl2_renderchain_data_t *chain)
-{
-#ifndef HAVE_OPENGLES
-   if (!chain)
-      return;
-   glGenVertexArrays(1, &chain->vao);
-#endif
-}
-
-static void gl2_renderchain_free_vao(
-      gl2_renderchain_data_t *chain)
-{
-#ifndef HAVE_OPENGLES
-   if (!chain)
-      return;
-   glDeleteVertexArrays(1, &chain->vao);
-#endif
-}
-
 static void gl2_renderchain_restore_default_state(
       gl_t *gl)
 {
@@ -2923,8 +2887,10 @@ static bool gl2_frame(void *data, const void *frame,
 
    gl2_context_bind_hw_render(gl, false);
 
+#ifndef HAVE_OPENGLES
    if (gl->core_context_in_use)
-      gl2_renderchain_bind_vao(chain);
+      glBindVertexArray(chain->vao);
+#endif
 
    gl->shader->use(gl, gl->shader_data, 1, true);
 
@@ -2946,15 +2912,9 @@ static bool gl2_frame(void *data, const void *frame,
 
    if (gl->should_resize)
    {
-      gfx_ctx_mode_t mode;
-
-      gl->should_resize = false;
-
-      mode.width        = width;
-      mode.height       = height;
-
       video_info->cb_set_resize(video_info->context_data,
-            mode.width, mode.height);
+            width, height);
+      gl->should_resize = false;
 
       if (gl->fbo_inited)
       {
@@ -3095,17 +3055,8 @@ static bool gl2_frame(void *data, const void *frame,
          &video_info->osd_stat_params;
 
       if (osd_params)
-      {
          font_driver_render_msg(video_info, NULL, video_info->stat_text,
                (const struct font_params*)&video_info->osd_stat_params);
-
-#if 0
-         osd_params->y               = 0.350f;
-         osd_params->scale           = 0.75f;
-         font_driver_render_msg(video_info, NULL, video_info->chat_text,
-               (const struct font_params*)&video_info->osd_stat_params);
-#endif
-      }
    }
 #endif
 
@@ -3179,11 +3130,11 @@ static bool gl2_frame(void *data, const void *frame,
             video_info->hard_sync_frames);
    }
 
+#ifndef HAVE_OPENGLES
    if (gl->core_context_in_use)
-      gl2_renderchain_unbind_vao();
-
+      glBindVertexArray(0);
+#endif
    gl2_context_bind_hw_render(gl, true);
-
    return true;
 }
 
@@ -3258,12 +3209,16 @@ static void gl2_free(void *data)
       scaler_ctx_gen_reset(&gl->pbo_readback_scaler);
    }
 
+#ifndef HAVE_OPENGLES
    if (gl->core_context_in_use)
    {
-      gl2_renderchain_unbind_vao();
-      gl2_renderchain_free_vao((gl2_renderchain_data_t*)
-            gl->renderchain_data);
+      gl2_renderchain_data_t *chain = (gl2_renderchain_data_t*)
+         gl->renderchain_data;
+
+      glBindVertexArray(0);
+      glDeleteVertexArrays(1, &chain->vao);
    }
+#endif
 
    gl2_renderchain_deinit_fbo(gl, (gl2_renderchain_data_t*)gl->renderchain_data);
    gl2_renderchain_deinit_hw_render(gl, (gl2_renderchain_data_t*)gl->renderchain_data);
@@ -3774,9 +3729,15 @@ static void *gl2_init(const video_info_t *video,
 
    gl2_renderchain_restore_default_state(gl);
 
+#ifndef HAVE_OPENGLES
    if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
-      gl2_renderchain_new_vao((gl2_renderchain_data_t*)
-            gl->renderchain_data);
+   {
+      gl2_renderchain_data_t *chain = (gl2_renderchain_data_t*)
+         gl->renderchain_data;
+
+      glGenVertexArrays(1, &chain->vao);
+   }
+#endif
 
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    glBlendEquation(GL_FUNC_ADD);
diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
index dd49fe75d1..615a00abe5 100644
--- a/gfx/drivers/gl_core.c
+++ b/gfx/drivers/gl_core.c
@@ -1597,10 +1597,10 @@ static void gl_core_draw_menu_texture(gl_core_t *gl, video_frame_info_t *video_i
 #endif
 
 static bool gl_core_frame(void *data, const void *frame,
-                          unsigned frame_width, unsigned frame_height,
-                          uint64_t frame_count,
-                          unsigned pitch, const char *msg,
-                          video_frame_info_t *video_info)
+      unsigned frame_width, unsigned frame_height,
+      uint64_t frame_count,
+      unsigned pitch, const char *msg,
+      video_frame_info_t *video_info)
 {
    struct gl_core_filter_chain_texture texture;
    struct gl_core_streamed_texture *streamed;
@@ -1684,15 +1684,9 @@ static bool gl_core_frame(void *data, const void *frame,
          &video_info->osd_stat_params;
 
       if (osd_params)
-      {
          font_driver_render_msg(video_info, NULL, video_info->stat_text,
                (const struct font_params*)&video_info->osd_stat_params);
-      }
    }
-
-#ifdef HAVE_MENU_WIDGETS
-   menu_widgets_frame(video_info);
-#endif
 #endif
 
 #ifdef HAVE_OVERLAY
@@ -1700,6 +1694,10 @@ static bool gl_core_frame(void *data, const void *frame,
       gl_core_render_overlay(gl, video_info);
 #endif
 
+#ifdef HAVE_MENU_WIDGETS
+   menu_widgets_frame(video_info);
+#endif
+
    if (!string_is_empty(msg))
    {
 #if 0