From 16b7b454a904ba47898b61b29c9d5d6930139a64 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 9 Apr 2015 04:57:17 +0200 Subject: [PATCH] Move gl_common.c to gfx/drivers --- Makefile.common | 2 +- apple/common/apple_cocoa_common.m | 2 +- gfx/drivers/gl.c | 2 +- gfx/{ => drivers}/gl_common.c | 0 gfx/{ => drivers}/gl_common.h | 8 ++++---- gfx/drivers_context/androidegl_ctx.c | 2 +- gfx/drivers_context/bbqnx_ctx.c | 2 +- gfx/drivers_context/drm_egl_ctx.c | 2 +- gfx/drivers_context/emscriptenegl_ctx.c | 2 +- gfx/drivers_context/glx_ctx.c | 2 +- gfx/drivers_context/mali_fbdev_ctx.c | 2 +- gfx/drivers_context/ps3_ctx.c | 2 +- gfx/drivers_context/sdl_gl_ctx.c | 2 +- gfx/drivers_context/vc_egl_ctx.c | 2 +- gfx/drivers_context/vivante_fbdev_ctx.c | 2 +- gfx/drivers_context/wayland_ctx.c | 2 +- gfx/drivers_context/wgl_ctx.c | 2 +- gfx/drivers_context/xegl_ctx.c | 2 +- gfx/drivers_font/gl_raster_font.c | 2 +- gfx/drivers_font/ps_libdbgfont.c | 2 +- gfx/drivers_shader/shader_gl_cg.c | 2 +- gfx/drivers_shader/shader_glsl.c | 2 +- gfx/drivers_shader/shader_null.c | 2 +- gfx/drivers_wm/win32_shader_dlg.c | 2 +- gfx/video_texture.c | 2 +- griffin/griffin.c | 2 +- menu/drivers/glui.c | 2 +- menu/drivers/xmb.c | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) rename gfx/{ => drivers}/gl_common.c (100%) rename gfx/{ => drivers}/gl_common.h (98%) diff --git a/Makefile.common b/Makefile.common index 3851ea2782..7832a2fe01 100644 --- a/Makefile.common +++ b/Makefile.common @@ -429,7 +429,7 @@ endif ifeq ($(HAVE_OPENGL), 1) DEFINES += -DHAVE_OPENGL -DHAVE_GLSL OBJ += gfx/drivers/gl.o \ - gfx/gl_common.o \ + gfx/drivers/gl_common.o \ gfx/video_context_driver.o \ gfx/drivers_context/gfx_null_ctx.o \ gfx/drivers_font/gl_raster_font.o \ diff --git a/apple/common/apple_cocoa_common.m b/apple/common/apple_cocoa_common.m index 2e47b52488..40a417f3ce 100644 --- a/apple/common/apple_cocoa_common.m +++ b/apple/common/apple_cocoa_common.m @@ -214,7 +214,7 @@ static RAGameView* g_instance; #include "../../gfx/video_viewport.h" #include "../../gfx/video_monitor.h" #include "../../gfx/video_context_driver.h" -#include "../../gfx/gl_common.h" +#include "../../gfx/drivers/gl_common.h" #include "../../runloop.h" //#define HAVE_NSOPENGL diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 2916e3fca7..0cd0824375 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -38,7 +38,7 @@ #include "config.h" #endif -#include "../gl_common.h" +#include "gl_common.h" #include "../font_driver.h" #include "../video_viewport.h" #include "../video_pixel_converter.h" diff --git a/gfx/gl_common.c b/gfx/drivers/gl_common.c similarity index 100% rename from gfx/gl_common.c rename to gfx/drivers/gl_common.c diff --git a/gfx/gl_common.h b/gfx/drivers/gl_common.h similarity index 98% rename from gfx/gl_common.h rename to gfx/drivers/gl_common.h index 3553379bd9..56528d9ffe 100644 --- a/gfx/gl_common.h +++ b/gfx/drivers/gl_common.h @@ -17,16 +17,16 @@ #ifndef __GL_COMMON_H #define __GL_COMMON_H -#include "../general.h" -#include "font_renderer_driver.h" +#include "../../general.h" +#include "../font_renderer_driver.h" #include #include #include -#include "video_shader_driver.h" +#include "../video_shader_driver.h" #include #ifdef HAVE_CONFIG_H -#include "../config.h" +#include "../../config.h" #endif #include diff --git a/gfx/drivers_context/androidegl_ctx.c b/gfx/drivers_context/androidegl_ctx.c index bdf6d4a1c6..49f6b6926e 100644 --- a/gfx/drivers_context/androidegl_ctx.c +++ b/gfx/drivers_context/androidegl_ctx.c @@ -18,7 +18,7 @@ #include "../../general.h" #include "../../runloop.h" #include "../video_monitor.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include diff --git a/gfx/drivers_context/bbqnx_ctx.c b/gfx/drivers_context/bbqnx_ctx.c index 63437782bc..bb8b5caf46 100644 --- a/gfx/drivers_context/bbqnx_ctx.c +++ b/gfx/drivers_context/bbqnx_ctx.c @@ -18,7 +18,7 @@ #include "../../general.h" #include "../../runloop.h" #include "../video_monitor.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include #include diff --git a/gfx/drivers_context/drm_egl_ctx.c b/gfx/drivers_context/drm_egl_ctx.c index f2dbd031f1..be473b49a6 100644 --- a/gfx/drivers_context/drm_egl_ctx.c +++ b/gfx/drivers_context/drm_egl_ctx.c @@ -20,7 +20,7 @@ #include "../../driver.h" #include "../../runloop.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c index a00643697e..5534376ee3 100644 --- a/gfx/drivers_context/emscriptenegl_ctx.c +++ b/gfx/drivers_context/emscriptenegl_ctx.c @@ -17,7 +17,7 @@ #include "../../driver.h" #include "../../runloop.h" #include "../video_context_driver.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #ifdef HAVE_CONFIG_H diff --git a/gfx/drivers_context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c index 30c1d8740e..236bd9a300 100644 --- a/gfx/drivers_context/glx_ctx.c +++ b/gfx/drivers_context/glx_ctx.c @@ -16,7 +16,7 @@ #include "../../driver.h" #include "../../runloop.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include "../drivers_wm/x11_common.h" diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c index 1adc5b43c6..d51db8fad6 100644 --- a/gfx/drivers_context/mali_fbdev_ctx.c +++ b/gfx/drivers_context/mali_fbdev_ctx.c @@ -17,7 +17,7 @@ #include "../../general.h" #include "../../runloop.h" #include "../video_monitor.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include #include diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c index 13fc2a616f..43283ced03 100644 --- a/gfx/drivers_context/ps3_ctx.c +++ b/gfx/drivers_context/ps3_ctx.c @@ -36,7 +36,7 @@ #include "config.h" #endif -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_context_driver.h" diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c index af2a586434..c2c61d9320 100644 --- a/gfx/drivers_context/sdl_gl_ctx.c +++ b/gfx/drivers_context/sdl_gl_ctx.c @@ -16,7 +16,7 @@ #include "../../driver.h" #include "../../runloop.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include "SDL.h" diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c index 096c6594b8..bb232afb5b 100644 --- a/gfx/drivers_context/vc_egl_ctx.c +++ b/gfx/drivers_context/vc_egl_ctx.c @@ -17,7 +17,7 @@ #include "../../driver.h" #include "../../runloop.h" #include "../video_context_driver.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c index a7ff7758cb..091b7a19b5 100644 --- a/gfx/drivers_context/vivante_fbdev_ctx.c +++ b/gfx/drivers_context/vivante_fbdev_ctx.c @@ -18,7 +18,7 @@ #include "../../general.h" #include "../../runloop.h" #include "../video_monitor.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include #include diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index e297606592..b268846caa 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -18,7 +18,7 @@ #include "../../general.h" #include "../../runloop.h" #include "../video_monitor.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include #include diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 5deae8ccb1..6a1a4ec3b1 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -24,7 +24,7 @@ #include "../../driver.h" #include "../../runloop.h" #include "../video_context_driver.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include "../drivers_wm/win32_common.h" #include "../drivers_wm/win32_shader_dlg.h" diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c index 0a3aed4a9e..1bffc3f061 100644 --- a/gfx/drivers_context/xegl_ctx.c +++ b/gfx/drivers_context/xegl_ctx.c @@ -20,7 +20,7 @@ #include "../../driver.h" #include "../../runloop.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include "../drivers_wm/x11_common.h" diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index 65b2813072..5de83fca84 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../font_driver.h" #include "../video_shader_driver.h" diff --git a/gfx/drivers_font/ps_libdbgfont.c b/gfx/drivers_font/ps_libdbgfont.c index 28abc47d59..91aa9eaf85 100644 --- a/gfx/drivers_font/ps_libdbgfont.c +++ b/gfx/drivers_font/ps_libdbgfont.c @@ -15,7 +15,7 @@ */ #include "../font_renderer_driver.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../font_driver.h" #if defined(SN_TARGET_PSP2) diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 133115809a..5d5d129e31 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -25,7 +25,7 @@ #include #ifdef HAVE_OPENGL -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include #endif diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 0af16718cd..2b4542b0f1 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -30,7 +30,7 @@ #include #ifdef HAVE_OPENGL -#include "../gl_common.h" +#include "../drivers/gl_common.h" #endif #ifdef HAVE_OPENGLES2 diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c index 571bd1e87a..78c2b90680 100644 --- a/gfx/drivers_shader/shader_null.c +++ b/gfx/drivers_shader/shader_null.c @@ -28,7 +28,7 @@ #endif #ifdef HAVE_OPENGL -#include "../gl_common.h" +#include "../drivers/gl_common.h" #endif #include "../video_shader_driver.h" diff --git a/gfx/drivers_wm/win32_shader_dlg.c b/gfx/drivers_wm/win32_shader_dlg.c index a88c45c68d..f59cedb779 100644 --- a/gfx/drivers_wm/win32_shader_dlg.c +++ b/gfx/drivers_wm/win32_shader_dlg.c @@ -28,7 +28,7 @@ #include "../../driver.h" #include "../../runloop.h" #include "../video_context_driver.h" -#include "../gl_common.h" +#include "../drivers/gl_common.h" #include "../video_monitor.h" #include "win32_common.h" #include "win32_shader_dlg.h" diff --git a/gfx/video_texture.c b/gfx/video_texture.c index bb444f85a9..26a2d685f5 100644 --- a/gfx/video_texture.c +++ b/gfx/video_texture.c @@ -20,7 +20,7 @@ #include "video_thread_wrapper.h" #ifdef HAVE_OPENGL -#include "gl_common.h" +#include "drivers/gl_common.h" static void video_texture_png_load_gl(struct texture_image *ti, enum texture_filter_type filter_type, diff --git a/griffin/griffin.c b/griffin/griffin.c index 4d620460dd..3d4a2ff053 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -206,7 +206,7 @@ VIDEO DRIVER #ifdef HAVE_OPENGL #include "../gfx/drivers/gl.c" -#include "../gfx/gl_common.c" +#include "../gfx/drivers/gl_common.c" #ifndef HAVE_PSGL #include "../libretro-common/glsym/rglgen.c" diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 92525fcb46..a8859edb55 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -24,7 +24,7 @@ #include "../menu.h" #include -#include "../../gfx/gl_common.h" +#include "../../gfx/drivers/gl_common.h" #include "../../gfx/font_driver.h" #include "../../gfx/video_texture.h" #include diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index b2006dcc77..bc403c881c 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -25,7 +25,7 @@ #include #include "../../gfx/video_thread_wrapper.h" -#include "../../gfx/gl_common.h" +#include "../../gfx/drivers/gl_common.h" #include "../../gfx/font_driver.h" #include "../../gfx/video_texture.h" #include