Move gl_common.c to gfx/drivers

This commit is contained in:
twinaphex 2015-04-09 04:57:17 +02:00
parent 8b2c8bae19
commit 16b7b454a9
28 changed files with 30 additions and 30 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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"

View File

@ -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 <gfx/math/matrix_4x4.h>
#include <gfx/scaler/scaler.h>
#include <formats/image.h>
#include "video_shader_driver.h"
#include "../video_shader_driver.h"
#include <retro_inline.h>
#ifdef HAVE_CONFIG_H
#include "../config.h"
#include "../../config.h"
#endif
#include <string.h>

View File

@ -18,7 +18,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include <EGL/egl.h>

View File

@ -18,7 +18,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include <EGL/egl.h>
#include <bps/screen.h>

View File

@ -20,7 +20,7 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include "../video_monitor.h"
#include <file/dir_list.h>

View File

@ -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

View File

@ -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"

View File

@ -17,7 +17,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include <EGL/egl.h>
#include <signal.h>

View File

@ -36,7 +36,7 @@
#include "config.h"
#endif
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include "../video_context_driver.h"

View File

@ -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"

View File

@ -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 <retro_inline.h>

View File

@ -18,7 +18,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include <EGL/egl.h>
#include <signal.h>

View File

@ -18,7 +18,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include <wayland-client.h>
#include <wayland-egl.h>

View File

@ -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"

View File

@ -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"

View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include "../font_driver.h"
#include "../video_shader_driver.h"

View File

@ -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)

View File

@ -25,7 +25,7 @@
#include <Cg/cg.h>
#ifdef HAVE_OPENGL
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#include <Cg/cgGL.h>
#endif

View File

@ -30,7 +30,7 @@
#include <stdlib.h>
#ifdef HAVE_OPENGL
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#endif
#ifdef HAVE_OPENGLES2

View File

@ -28,7 +28,7 @@
#endif
#ifdef HAVE_OPENGL
#include "../gl_common.h"
#include "../drivers/gl_common.h"
#endif
#include "../video_shader_driver.h"

View File

@ -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"

View File

@ -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,

View File

@ -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"

View File

@ -24,7 +24,7 @@
#include "../menu.h"
#include <file/file_path.h>
#include "../../gfx/gl_common.h"
#include "../../gfx/drivers/gl_common.h"
#include "../../gfx/font_driver.h"
#include "../../gfx/video_texture.h"
#include <compat/posix_string.h>

View File

@ -25,7 +25,7 @@
#include <file/file_path.h>
#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 <compat/posix_string.h>