Integrate video_driver.c into retroarch.c

.vscode/settings.json

@@ -23,7 +23,6 @@
       "ios": "c",
       "list": "c",
       "input_driver.h": "c",
-      "video_driver.h": "c",
       "menu_driver.h": "c",
       "file_path.h": "c",
       "unordered_map": "c",
@@ -54,7 +53,6 @@
       "verbosity.h": "c",
       "retroarch.h": "c",
       "menu_animation.h": "c",
-      "audio_driver.h": "c",
       "netplay.h": "c",
       "scaler.h": "c",
       "deque": "c",
@@ -71,4 +69,4 @@
       "badges.h": "c"
    },
    "C_Cpp.dimInactiveRegions": false,
-}
+}

Makefile.common

@@ -213,7 +213,6 @@ OBJ += frontend/frontend.o \
        led/drivers/led_null.o \
        gfx/video_coord_array.o \
        gfx/video_display_server.o \
-       gfx/video_driver.o \
        gfx/video_crt_switch.o \
        wifi/wifi_driver.o \
        configuration.o \

command.c

@@ -91,7 +91,6 @@
 #include "ui/ui_companion_driver.h"
 #include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"
-#include "gfx/video_driver.h"
 #include "list_special.h"
 
 #include "core.h"

configuration.c

@@ -33,7 +33,6 @@
 #endif
 
 #include "file_path_special.h"
-#include "gfx/video_driver.h"
 #include "input/input_driver.h"
 #include "configuration.h"
 #include "content.h"

core_impl.c

@@ -41,7 +41,6 @@
 #include "msg_hash.h"
 #include "managers/state_manager.h"
 #include "verbosity.h"
-#include "gfx/video_driver.h"
 #include "retroarch.h"
 #include "tasks/tasks_internal.h"
 

dynamic.c

@@ -55,7 +55,6 @@
 #include "record/record_driver.h"
 #include "driver.h"
 #include "performance_counters.h"
-#include "gfx/video_driver.h"
 #include "led/led_driver.h"
 #include "midi/midi_driver.h"
 

frontend/drivers/platform_emscripten.c

@@ -37,7 +37,6 @@
 
 #include "../frontend.h"
 #include "../frontend_driver.h"
-#include "../../gfx/video_driver.h"
 #include "../../configuration.h"
 #include "../../defaults.h"
 #include "../../content.h"

frontend/drivers/platform_wiiu.c

@@ -45,9 +45,8 @@
 #include "../frontend_driver.h"
 #include "../../defaults.h"
 #include "../../paths.h"
-#include "../../verbosity.h"
 #include "../../retroarch.h"
-#include "../../gfx/video_driver.h"
+#include "../../verbosity.h"
 
 #include "hbl.h"
 #include "wiiu_dbg.h"

gfx/common/d3d10_common.h

@@ -1060,7 +1060,7 @@ static INLINE HRESULT D3D10CreateTexture2DShaderResourceView(
 #include <retro_math.h>
 #include <gfx/math/matrix_4x4.h>
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 typedef struct d3d10_vertex_t
 {

gfx/common/d3d11_common.h

@@ -2426,7 +2426,7 @@ D3D11UnmapBuffer(D3D11DeviceContext device_context, D3D11Buffer buffer, UINT sub
 #include <retro_math.h>
 #include <gfx/math/matrix_4x4.h>
 #include <libretro_d3d.h>
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../drivers_shader/slang_process.h"
 
 typedef struct d3d11_vertex_t

gfx/common/d3d12_common.h

@@ -1260,7 +1260,7 @@ D3D12GetGPUDescriptorHandleForHeapStart(D3D12DescriptorHeap descriptor_heap)
 #include <gfx/math/matrix_4x4.h>
 
 #include "../common/d3dcompiler_common.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../drivers_shader/slang_process.h"
 
 typedef struct d3d12_vertex_t

gfx/common/d3d8_common.h

@@ -22,7 +22,7 @@
 
 #include <d3d8.h>
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 RETRO_BEGIN_DECLS

gfx/common/d3d9_common.h

@@ -24,7 +24,7 @@
 #include <d3d9.h>
 
 #include "d3d_common.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #define D3D9_DECL_FVF_TEXCOORD(stream, offset, index) \

gfx/common/d3d_common.c

@@ -12,6 +12,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <math.h>
+
 #include <string/stdstring.h>
 
 #include "../../configuration.h"

gfx/common/d3d_common.h

@@ -36,7 +36,7 @@
 #include <retro_common_api.h>
 
 #include "../font_driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 RETRO_BEGIN_DECLS
 

gfx/common/drm_common.h

@@ -27,7 +27,7 @@
 #include <retro_common_api.h>
 #include <retro_inline.h>
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 RETRO_BEGIN_DECLS
 

gfx/common/dxgi_common.c

@@ -27,7 +27,7 @@
 #include "../../configuration.h"
 #include "../../verbosity.h"
 #include "../../ui/ui_companion_driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../frontend/frontend_driver.h"
 #include "win32_common.h"
 

gfx/common/dxgi_common.h

@@ -786,7 +786,7 @@ static INLINE HRESULT DXGICreateFactory2(DXGIFactory2* factory)
 
 /* internal */
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../drivers_shader/glslang_util.h"
 
 #define DXGI_COLOR_RGBA(r, g, b, a) (((UINT32)(a) << 24) | ((UINT32)(b) << 16) | ((UINT32)(g) << 8) | ((UINT32)(r) << 0))

gfx/common/egl_common.h

@@ -26,7 +26,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 #ifndef EGL_CONTEXT_FLAGS_KHR
 #define EGL_CONTEXT_FLAGS_KHR 0x30FC

gfx/common/gl1_common.h

@@ -20,6 +20,7 @@
 
 #include <retro_environment.h>
 #include <retro_inline.h>
+#include <gfx/math/matrix_4x4.h>
 
 #if defined(__APPLE__)
 #include <OpenGL/gl.h>
@@ -33,7 +34,7 @@
 #include <GL/glext.h>
 #endif
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 #define RARCH_GL1_INTERNAL_FORMAT32 GL_RGBA8
 #define RARCH_GL1_TEXTURE_TYPE32 GL_BGRA_EXT

gfx/common/gl_common.h

@@ -33,7 +33,7 @@
 #include <formats/image.h>
 
 #include "../video_coord_array.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 RETRO_BEGIN_DECLS
 

gfx/common/gl_core_common.h

@@ -33,7 +33,7 @@
 #include <formats/image.h>
 
 #include "../video_coord_array.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../drivers_shader/shader_gl_core.h"
 
 RETRO_BEGIN_DECLS

gfx/common/vita2d_common.h

@@ -25,7 +25,7 @@
 
 #include "../../defines/psp_defines.h"
 #include "../../driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../video_coord_array.h"
 
 typedef struct vita_menu_frame

gfx/common/vulkan_common.h

@@ -46,7 +46,6 @@
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../font_driver.h"
-#include "../video_driver.h"
 #include "../drivers_shader/shader_vulkan.h"
 #include "../include/vulkan/vulkan.h"
 

gfx/common/win32_common.c

@@ -56,7 +56,7 @@
 #include "../../input/input_keymaps.h"
 #include "../video_thread_wrapper.h"
 #include "../video_display_server.h"
-#include "../../gfx/video_driver.h"
+#include "../../retroarch.h"
 #include <shellapi.h>
 
 #ifdef HAVE_MENU

gfx/common/win32_common.h

@@ -34,7 +34,7 @@
 #include <retro_common_api.h>
 #include <retro_environment.h>
 #include "../../driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 #ifndef _XBOX
 #include "../../ui/drivers/ui_win32_resource.h"

gfx/common/x11_common.h

@@ -21,7 +21,7 @@
 
 #include <boolean.h>
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 extern Window   g_x11_win;
 extern Display *g_x11_dpy;

gfx/display_servers/dispserv_win32.c

@@ -37,8 +37,8 @@
 
 #include "../video_display_server.h"
 #include "../common/win32_common.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
-#include "../video_driver.h" /* needed to set refresh rate in set resolution */
 
 #ifdef __ITaskbarList3_INTERFACE_DEFINED__
 #define HAS_TASKBAR_EXT

gfx/display_servers/dispserv_x11.c

@@ -36,7 +36,7 @@
 #include "../video_display_server.h"
 #include "../common/x11_common.h"
 #include "../../configuration.h"
-#include "../video_driver.h" /* needed to set refresh rate in set resolution */
+#include "../../retroarch.h"
 #include "../video_crt_switch.h" /* needed to set aspect for low res in linux */
 
 #ifdef HAVE_XRANDR

gfx/drivers/d3d10.c

@@ -29,7 +29,6 @@
 #include "../../retroarch.h"
 #include "../../managers/state_manager.h"
 
-#include "../video_driver.h"
 #include "../font_driver.h"
 #include "../common/d3d_common.h"
 #include "../common/win32_common.h"

gfx/drivers/d3d11.c

@@ -36,7 +36,6 @@
 #include "../../verbosity.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
-#include "../video_driver.h"
 #include "../font_driver.h"
 #include "../common/win32_common.h"
 #include "../../performance_counters.h"

gfx/drivers/d3d12.c

@@ -20,7 +20,6 @@
 #include <string/stdstring.h>
 #include <file/file_path.h>
 
-#include "../video_driver.h"
 #include "../font_driver.h"
 #include "../common/d3d_common.h"
 #include "../common/win32_common.h"

gfx/drivers/d3d8.c

@@ -36,9 +36,9 @@
 #include "../common/d3d_common.h"
 #include "../video_coord_array.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../dynamic.h"
 #include "../../frontend/frontend_driver.h"
-#include "../video_driver.h"
 
 #ifdef HAVE_THREADS
 #include "../video_thread_wrapper.h"

gfx/drivers/d3d9.c

@@ -37,7 +37,6 @@
 #include "../video_coord_array.h"
 #include "../../configuration.h"
 #include "../../dynamic.h"
-#include "../video_driver.h"
 #include "../../ui/ui_companion_driver.h"
 #include "../../frontend/frontend_driver.h"
 

gfx/drivers/nullgfx.c

@@ -14,9 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../video_driver.h"
-
 #include "../../driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 static void *null_gfx_init(const video_info_t *video,

gfx/drivers/ps2_gfx.c

@@ -13,14 +13,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../video_driver.h"
-
-#include "../../driver.h"
-#include "../../verbosity.h"
-
 #include <kernel.h>
 #include <gsKit.h>
 #include <gsInline.h>
+
+#include "../../driver.h"
+#include "../../retroarch.h"
+#include "../../verbosity.h"
+
 #include "../../libretro-common/include/libretro_gskit_ps2.h"
 
 #define GS_TEXT GS_SETREG_RGBAQ(0x80,0x80,0x80,0x80,0x00) // turn white GS Screen

gfx/drivers/sdl_gfx.c

@@ -40,9 +40,9 @@
 #include "SDL_syswm.h"
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 
 #include "../../configuration.h"
+#include "../../retroarch.h"
 
 typedef struct sdl_menu_frame
 {

gfx/drivers_context/cgl_ctx.c

@@ -29,7 +29,7 @@
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 typedef int CGSConnectionID;
 typedef int CGSWindowID;

gfx/drivers_context/cocoa_gl_ctx.m

@@ -38,8 +38,8 @@
 
 #include "../../ui/drivers/ui_cocoa.h"
 #include "../../ui/drivers/cocoa/cocoa_common.h"
-#include "../video_driver.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #ifdef HAVE_VULKAN
 #include "../common/vulkan_common.h"

gfx/drivers_context/emscriptenegl_ctx.c

@@ -26,7 +26,7 @@
 #include "../../config.h"
 #endif
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #ifdef HAVE_EGL

gfx/drivers_context/gdi_ctx.c

@@ -34,11 +34,11 @@
 #include "../../config.h"
 #endif
 
-#include "../../configuration.h"
 #include "../../dynamic.h"
+#include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
-#include "../video_driver.h"
 
 #include "../common/win32_common.h"
 

gfx/drivers_context/gfx_null_ctx.c

@@ -16,7 +16,7 @@
 
 /* Null context. */
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 static void gfx_ctx_null_swap_interval(void *data, int interval)
 {

gfx/drivers_context/khr_display_ctx.c

@@ -58,7 +58,8 @@ static void gfx_ctx_khr_display_get_video_size(void *data,
    *height = khr->height;
 }
 
-static void *gfx_ctx_khr_display_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_khr_display_init(video_frame_info_t *video_info,
+      void *video_driver)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)calloc(1, sizeof(*khr));
    if (!khr)

gfx/drivers_context/mali_fbdev_ctx.c

@@ -92,7 +92,8 @@ static void gfx_ctx_mali_fbdev_get_video_size(void *data,
    *height = mali->height;
 }
 
-static void *gfx_ctx_mali_fbdev_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_mali_fbdev_init(video_frame_info_t *video_info,
+      void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;

gfx/drivers_context/ps3_ctx.c

@@ -33,11 +33,11 @@
 #include <compat/strl.h>
 
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../defines/ps3_defines.h"
 #include "../../frontend/frontend_driver.h"
 #include "../common/gl_common.h"
-#include "../video_driver.h"
 
 typedef struct gfx_ctx_ps3_data
 {

gfx/drivers_context/sixel_ctx.c

@@ -23,9 +23,9 @@
 
 #include "../../configuration.h"
 #include "../../dynamic.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../ui/ui_companion_driver.h"
-#include "../video_driver.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../common/win32_common.h"

gfx/drivers_context/vc_egl_ctx.c

@@ -33,7 +33,7 @@
 #include <retro_inline.h>
 
 #include "../../configuration.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 
 #include "../../frontend/frontend_driver.h"
 

gfx/drivers_context/wgl_ctx.c

@@ -41,9 +41,9 @@
 
 #include "../../configuration.h"
 #include "../../dynamic.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
-#include "../video_driver.h"
 
 #include "../common/win32_common.h"
 

gfx/drivers_font/ctr_font.c

@@ -24,11 +24,11 @@
 #include <retro_math.h>
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 #include "../common/ctr_common.h"
 #include "../drivers/ctr_gu.h"
 #include "../../ctr/gpu_old.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* FIXME: this is just a workaround to avoid

gfx/drivers_font/d3d10_font.c

@@ -23,9 +23,9 @@
 #include <encodings/utf.h>
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 #include "../common/d3d10_common.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct

gfx/drivers_font/d3d11_font.c

@@ -22,9 +22,9 @@
 #include <encodings/utf.h>
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 #include "../common/d3d11_common.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct

gfx/drivers_font/d3d12_font.c

@@ -22,9 +22,9 @@
 #include <encodings/utf.h>
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 #include "../common/d3d12_common.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct

gfx/drivers_font/gdi_font.c

@@ -25,8 +25,8 @@
 #endif
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../common/gdi_common.h"
 #include "../common/win32_common.h"

gfx/drivers_font/gl1_raster_font.c

@@ -23,7 +23,7 @@
 
 #include "../common/gl1_common.h"
 #include "../font_driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */

gfx/drivers_font/gl_core_raster_font.c

@@ -24,7 +24,7 @@
 
 #include "../common/gl_core_common.h"
 #include "../font_driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */

gfx/drivers_font/gl_raster_font.c

@@ -23,7 +23,7 @@
 
 #include "../common/gl_common.h"
 #include "../font_driver.h"
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */

gfx/drivers_font/switch_font.c

@@ -24,8 +24,8 @@
 #include <retro_math.h>
 
 #include "../font_driver.h"
-#include "../video_driver.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #include "../common/switch_common.h"

gfx/drivers_font/wiiu_font.c

@@ -21,13 +21,13 @@
 #include <encodings/utf.h>
 #include <wiiu/gx2.h>
 
-#include "gfx/font_driver.h"
-#include "gfx/video_driver.h"
-#include "gfx/common/gx2_common.h"
-#include "system/memory.h"
-#include "wiiu/wiiu_dbg.h"
+#include "../font_driver.h"
+#include "../common/gx2_common.h"
+#include "../../wiiu/system/memory.h"
+#include "../../wiiu/wiiu_dbg.h"
 
-#include "verbosity.h"
+#include "../../retroarch.h"
+#include "../../verbosity.h"
 
 typedef struct
 {

gfx/drivers_font_renderer/freetype.c

@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
+#include <math.h>
 #include <ctype.h>
 
 #include <ft2build.h>

gfx/drivers_renderchain/d3d9_cg_renderchain.c

@@ -34,8 +34,8 @@
 #include "../common/d3d_common.h"
 #include "../drivers/d3d_shaders/opaque.cg.d3d9.h"
 
-#include "../video_driver.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #include "d3d9_renderchain.h"

gfx/drivers_renderchain/d3d9_hlsl_renderchain.c

@@ -32,8 +32,6 @@
 #include "../common/d3d_common.h"
 #include "../common/d3d9_common.h"
 
-#include "../video_driver.h"
-
 #include "../video_shader_parse.h"
 #include "../../managers/state_manager.h"
 #include "../../configuration.h"

gfx/drivers_shader/shader_gl_cg.c

@@ -45,9 +45,9 @@
 
 #include "../include/Cg/cg.h"
 
-#include "../video_driver.h"
 #include "../video_shader_parse.h"
 #include "../../core.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../managers/state_manager.h"
 

gfx/drivers_shader/shader_gl_core.cpp

@@ -20,6 +20,7 @@
 #include <memory>
 #include <functional>
 #include <utility>
+#include <math.h>
 #include <string.h>
 
 #include <compat/strl.h>
@@ -30,7 +31,7 @@
 #include "slang_reflection.hpp"
 #include "spirv_glsl.hpp"
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
 

gfx/drivers_shader/shader_glsl.h

@@ -18,7 +18,8 @@
 #define __RARCH_GLSL_H
 
 #include <boolean.h>
-#include "../video_driver.h"
+
+#include "../../retroarch.h"
 
 void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));
 

gfx/drivers_shader/shader_vulkan.cpp

@@ -30,7 +30,7 @@
 #include "slang_reflection.h"
 #include "slang_reflection.hpp"
 
-#include "../video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
 

gfx/drivers_shader/slang_preprocess.h

@@ -18,7 +18,8 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
-#include "../video_driver.h"
+
+#include "../../retroarch.h"
 
 RETRO_BEGIN_DECLS
 

gfx/font_driver.c

@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -24,6 +25,7 @@
 #include "video_thread_wrapper.h"
 
 #include "../configuration.h"
+#include "../retroarch.h"
 #include "../verbosity.h"
 
 static const font_renderer_driver_t *font_backends[] = {

gfx/font_driver.h

@@ -22,7 +22,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "video_driver.h"
+#include "../retroarch.h"
 
 RETRO_BEGIN_DECLS
 

gfx/video_crt_switch.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "video_driver.h"
+#include "../retroarch.h"
 #include "video_crt_switch.h"
 #include "video_display_server.h"
 

gfx/video_display_server.c

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include "video_display_server.h"
-#include "video_driver.h"
+#include "../retroarch.h"
 #include "../verbosity.h"
 
 static const video_display_server_t *current_display_server = &dispserv_null;

gfx/video_layout.c

@@ -1,14 +1,14 @@
-#include "video_layout.h"
-#include "video_layout/view.h"
-#include "video_driver.h"
-#include <stdlib.h>
-#include <string.h>
 #include <formats/rxml.h>
 #include <file/file_path.h>
 #include <file/archive_file.h>
 #include <compat/strl.h>
 #include <verbosity.h>
 
+#include "video_layout.h"
+#include "video_layout/view.h"
+
+#include "../retroarch.h"
+
 bool load(view_array_t *view_array, rxml_document_t *doc);
 
 typedef struct io

gfx/video_shader_parse.c

@@ -31,11 +31,11 @@
 #include <streams/interface_stream.h>
 #include <lists/string_list.h>
 
-#include "../verbosity.h"
 #include "../configuration.h"
+#include "../retroarch.h"
+#include "../verbosity.h"
 #include "../frontend/frontend_driver.h"
 #include "../command.h"
-#include "video_driver.h"
 #include "video_shader_parse.h"
 
 #if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS)

gfx/video_thread_wrapper.c

@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+#include <math.h>
 
 #include <compat/strl.h>
 #include <features/features_cpu.h>

gfx/video_thread_wrapper.h

@@ -22,7 +22,6 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "video_driver.h"
 #include "font_driver.h"
 
 RETRO_BEGIN_DECLS

griffin/griffin.c

@@ -885,7 +885,6 @@ MIDI
 /*============================================================
 DRIVERS
 ============================================================ */
-#include "../gfx/video_driver.c"
 #include "../gfx/video_crt_switch.c"
 #include "../gfx/video_display_server.c"
 #include "../gfx/video_coord_array.c"

input/drivers/android_input.c

@@ -37,12 +37,12 @@
 
 #include "../../command.h"
 #include "../../frontend/drivers/platform_unix.h"
-#include "../../gfx/video_driver.h"
 #include "../drivers_keyboard/keyboard_event_android.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../performance_counters.h"
 
 #include "../../configuration.h"
+#include "../../retroarch.h"
 
 #define MAX_TOUCH 16
 #define MAX_NUM_KEYBOARDS 3

input/drivers/cocoa_input.c

@@ -28,7 +28,7 @@
 
 #include "cocoa_input.h"
 
-#include "../../gfx/video_driver.h"
+#include "../../retroarch.h"
 #include "../../driver.h"
 
 #include "../drivers_keyboard/keyboard_event_apple.h"

input/drivers/dinput.c

@@ -48,9 +48,8 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 
-#include "../../gfx/video_driver.h"
-
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* Keep track of which pad indexes are 360 controllers.

input/drivers/qnx_input.c

@@ -29,7 +29,7 @@
 
 #include "../input_driver.h"
 
-#include "../../gfx/video_driver.h"
+#include "../../retroarch.h"
 #include "../../tasks/tasks_internal.h"
 
 #include "../../command.h"

input/drivers/rwebinput_input.c

@@ -29,9 +29,9 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 
-#include "../../gfx/video_driver.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button */

input/drivers/sdl_input.c

@@ -27,7 +27,7 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 
-#include "../../gfx/video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"
 

input/drivers/udev_input.c

@@ -69,10 +69,10 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 
-#include "../../gfx/video_driver.h"
 #include "../common/linux_common.h"
-#include "../../configuration.h"
 
+#include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #if defined(HAVE_XKBCOMMON) && defined(HAVE_KMS)

input/drivers/wayland_input.c

@@ -40,11 +40,11 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 
-#include "../../gfx/video_driver.h"
 #include "../common/linux_common.h"
 
 #include "../../gfx/common/wayland_common.h"
 
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO/FIXME -

input/drivers/winraw_input.c

@@ -19,7 +19,7 @@
 #include "../input_keymaps.h"
 
 #include "../../configuration.h"
-#include "../../gfx/video_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct

input/drivers/x11_input.c

@@ -27,10 +27,10 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 
-#include "../../gfx/video_driver.h"
 #include "../common/input_x11_common.h"
 
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct x11_input

input/drivers_joypad/dinput_joypad.c

@@ -30,9 +30,9 @@
 #endif
 
 #include "../../tasks/tasks_internal.h"
-#include "../../gfx/video_driver.h"
 #include "../input_driver.h"
 #include "../input_keymaps.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "dinput_joypad.h"
 

input/include/wiiu/input.h

@@ -42,7 +42,6 @@
 #include "../../../config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "../../../gfx/video_driver.h"
 #include "../../../tasks/tasks_internal.h"
 
 #define WIIMOTE_TYPE_WIIPLUS 0x00

input/input_overlay.c

@@ -30,8 +30,8 @@
 #include "../menu/menu_driver.h"
 #endif
 
+#include "../retroarch.h"
 #include "../verbosity.h"
-#include "../gfx/video_driver.h"
 #include "input_overlay.h"
 
 #define OVERLAY_GET_KEY(state, key) (((state)->keys[(key) / 32] >> ((key) % 32)) & 1)

led/drivers/led_overlay.c

@@ -2,11 +2,12 @@
 #include "../led_driver.h"
 #include "../led_defines.h"
 
+#include "../../input/input_overlay.h"
+
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
-#include "../../gfx/video_driver.h"
-#include "../../input/input_overlay.h"
 
 typedef struct
 {

list_special.c

@@ -38,7 +38,6 @@
 #include "list_special.h"
 #include "frontend/frontend_driver.h"
 #include "core_info.h"
-#include "gfx/video_driver.h"
 #include "input/input_driver.h"
 #include "record/record_driver.h"
 #include "midi/midi_driver.h"

managers/core_option_manager.h

@@ -23,7 +23,7 @@
 #include <retro_common_api.h>
 #include <lists/string_list.h>
 
-#include "../gfx/video_driver.h"
+#include "../../retroarch.h"
 
 RETRO_BEGIN_DECLS
 

menu/cbs/menu_cbs_left.c

@@ -36,7 +36,6 @@
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../driver.h"
-#include "../../gfx/video_driver.h"
 #include "../../retroarch.h"
 #include "../../network/netplay/netplay.h"
 

menu/cbs/menu_cbs_start.c

@@ -36,8 +36,6 @@
 #include "../../retroarch.h"
 #include "../../performance_counters.h"
 
-#include "../../gfx/video_driver.h"
-
 #include "../../input/input_driver.h"
 #include "../../input/input_remapping.h"
 

menu/drivers/xui.cpp

@@ -40,8 +40,6 @@
 #include "../menu_setting.h"
 #include "../widgets/menu_input_dialog.h"
 
-#include "../../gfx/video_driver.h"
-
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"

menu/drivers_display/menu_display_caca.c

@@ -21,7 +21,7 @@
 
 #include "../../config.def.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_driver.h"
+#include "../../retroarch.h"
 
 #include "../menu_driver.h"
 

menu/drivers_display/menu_display_ctr.c

@@ -23,7 +23,6 @@
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_driver.h"
 #include "../../gfx/common/ctr_common.h"
 #include "../../gfx/drivers/ctr_gu.h"
 #include "../../ctr/gpu_old.h"

menu/drivers_display/menu_display_d3d10.c

@@ -26,7 +26,6 @@
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_driver.h"
 #include "../../gfx/common/d3d10_common.h"
 
 static const float* menu_display_d3d10_get_default_vertices(void)

menu/drivers_display/menu_display_d3d11.c

@@ -25,7 +25,6 @@
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_driver.h"
 #include "../../gfx/common/d3d11_common.h"
 
 static const float* menu_display_d3d11_get_default_vertices(void)