Update

gfx/drivers/gl.c

@@ -41,8 +41,6 @@
 #include <gfx/gl_capabilities.h>
 #include <gfx/video_frame.h>
 
-#include "../drivers_renderchain/gl2_renderchain.h"
-
 #include "../../configuration.h"
 #include "../../dynamic.h"
 #include "../../record/record_driver.h"
@@ -2375,7 +2373,8 @@ static bool gl_set_shader(void *data,
    }
 
 #ifdef HAVE_FBO
-   gl2_renderchain_deinit_fbo(gl);
+   if (gl->renderchain_driver->deinit_fbo)
+      gl->renderchain_driver->deinit_fbo(gl);
    glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
 #endif
 

gfx/drivers_renderchain/gl2_renderchain.c

@@ -28,6 +28,9 @@
 #include "config.h"
 #endif
 
+#include <retro_common_api.h>
+#include <libretro.h>
+
 #include <compat/strl.h>
 #include <gfx/scaler/scaler.h>
 #include <formats/image.h>
@@ -39,8 +42,8 @@
 #include <gfx/gl_capabilities.h>
 #include <gfx/video_frame.h>
 
-#include "gl2_renderchain.h"
 #include "../video_driver.h"
+#include "../video_shader_parse.h"
 #include "../common/gl_common.h"
 
 #include "../../driver.h"
@@ -57,6 +60,12 @@
    coords[5] = yamt; \
    coords[7] = yamt
 
+typedef struct gl2_renderchain
+{
+   void *empty;
+} gl2_renderchain_t;
+
+/* Prototypes */
 #ifdef IOS
 /* There is no default frame buffer on iOS. */
 void cocoagl_bind_game_view_fbo(void);
@@ -65,12 +74,8 @@ void cocoagl_bind_game_view_fbo(void);
 #define gl_bind_backbuffer() glBindFramebuffer(RARCH_GL_FRAMEBUFFER, 0)
 #endif
 
-typedef struct gl2_renderchain
-{
-   void *empty;
-} gl2_renderchain_t;
+void context_bind_hw_render(bool enable);
 
-/* Prototypes */
 GLenum min_filter_to_mag(GLenum type);
 
 void gl_load_texture_data(
@@ -402,7 +407,7 @@ static void gl2_renderchain_render(
    gl->coords.tex_coord = gl->tex_info.coord;
 }
 
-void gl2_renderchain_deinit_fbo(void *data)
+static void gl2_renderchain_deinit_fbo(void *data)
 {
    gl_t *gl = (gl_t*)data;
    if (!gl->fbo_inited)
@@ -1104,6 +1109,7 @@ static void *gl2_renderchain_new(void)
 
 #ifdef HAVE_FBO
 gl_renderchain_driver_t gl2_renderchain = {
+   gl2_renderchain_deinit_fbo,
    gl2_renderchain_viewport_info,
    gl2_renderchain_read_viewport,
    gl2_renderchain_bind_prev_texture,

gfx/drivers_renderchain/gl2_renderchain.h

@@ -1,35 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GL2_RENDER_CHAIN_H
-#define __GL2_RENDER_CHAIN_H
-
-#include <retro_common_api.h>
-#include <libretro.h>
-
-#include "../video_driver.h"
-#include "../video_shader_parse.h"
-
-RETRO_BEGIN_DECLS
-
-void gl2_renderchain_deinit_fbo(void *data);
-
-void context_bind_hw_render(bool enable);
-
-RETRO_END_DECLS
-
-#endif
-

gfx/video_driver.h

@@ -827,6 +827,7 @@ typedef struct d3d_renderchain_driver
 
 typedef struct gl_renderchain_driver
 {
+   void (*deinit_fbo)(void *data);
    void (*viewport_info)(
          void *data, struct video_viewport *vp);
    bool (*read_viewport)(