Move gl_common to gfx/common

This commit is contained in:
twinaphex 2015-11-17 08:01:33 +01:00
parent 4e6cb53920
commit 239ae7de53
25 changed files with 28 additions and 24 deletions

View File

@ -576,7 +576,7 @@ endif
ifeq ($(HAVE_GL_CONTEXT), 1)
DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
OBJ += gfx/drivers/gl.o \
gfx/drivers/gl_common.o \
gfx/common/gl_common.o \
gfx/drivers_font/gl_raster_font.o \
libretro-common/glsym/rglgen.o

View File

@ -24,7 +24,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../../frontend/drivers/platform_linux.h"

View File

@ -29,7 +29,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../image/image.h"

View File

@ -43,7 +43,7 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../video_monitor.h"
#ifdef HAVE_CONFIG_H

View File

@ -25,7 +25,7 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../video_context_driver.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../video_monitor.h"
#ifdef HAVE_CONFIG_H

View File

@ -21,8 +21,9 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../drivers/gl_common.h"
#include "../video_monitor.h"
#include "../common/gl_common.h"
#include "../common/x11_common.h"
static int (*g_pglSwapInterval)(int);

View File

@ -30,7 +30,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
struct fbdev_window native_window;
static EGLContext g_egl_ctx;

View File

@ -29,7 +29,7 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../../defines/ps3_defines.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../video_context_driver.h"
#include "../video_monitor.h"

View File

@ -18,7 +18,7 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../video_monitor.h"
static enum gfx_ctx_api g_api = GFX_CTX_OPENGL_API;

View File

@ -32,7 +32,7 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../video_context_driver.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#include "../video_monitor.h"
#ifdef HAVE_CONFIG_H

View File

@ -22,7 +22,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
static EGLContext g_egl_ctx;
static EGLSurface g_egl_surf;

View File

@ -28,7 +28,7 @@
#include "../../general.h"
#include "../../runloop.h"
#include "../video_monitor.h"
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
typedef struct gfx_ctx_wayland_data
{

View File

@ -35,9 +35,11 @@
#include "../../dynamic.h"
#include "../../runloop.h"
#include "../video_context_driver.h"
#include "../drivers/gl_common.h"
#include "../video_monitor.h"
#include "../common/gl_common.h"
#include "../common/win32_common.h"
#include "../drivers_wm/win32_shader_dlg.h"
#ifndef WGL_CONTEXT_MAJOR_VERSION_ARB

View File

@ -26,8 +26,8 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../drivers/gl_common.h"
#include "../video_monitor.h"
#include "../common/gl_common.h"
#include "../common/x11_common.h"
#ifndef EGL_OPENGL_ES3_BIT_KHR

View File

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

View File

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

View File

@ -31,7 +31,7 @@
#endif
#ifdef HAVE_OPENGL
#include "../drivers/gl_common.h"
#include "../common/gl_common.h"
#endif
#ifdef HAVE_OPENGLES2

View File

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

View File

@ -36,11 +36,12 @@
#include "../../driver.h"
#include "../../runloop.h"
#include "../video_context_driver.h"
#include "../drivers/gl_common.h"
#include "../video_monitor.h"
#include "../common/win32_common.h"
#include "win32_shader_dlg.h"
#include "../common/gl_common.h"
#include "../common/win32_common.h"
#define IDI_ICON 1
#define SHADER_DLG_WIDTH 220

View File

@ -31,7 +31,7 @@ extern "C" {
#endif
#ifdef HAVE_OPENGL
#include "drivers/gl_common.h"
#include "common/gl_common.h"
void gl_load_texture_data(GLuint id,
enum gfx_wrap_type wrap_type,

View File

@ -228,8 +228,8 @@ VIDEO DRIVER
#endif
#ifdef HAVE_OPENGL
#include "../gfx/common/gl_common.c"
#include "../gfx/drivers/gl.c"
#include "../gfx/drivers/gl_common.c"
#ifndef HAVE_PSGL
#include "../libretro-common/glsym/rglgen.c"

View File

@ -20,7 +20,7 @@
#include "../../gfx/video_context_driver.h"
#include "../../gfx/video_thread_wrapper.h"
#include "../../gfx/video_texture.h"
#include "../../gfx/drivers/gl_common.h"
#include "../../gfx/common/gl_common.h"
#include "../menu_display.h"

View File

@ -171,7 +171,7 @@ void *glkitview_init(void);
#endif
#ifdef HAVE_AVFOUNDATION
#include "../../gfx/drivers/gl_common.h"
#include "../../gfx/common/gl_common.h"
#ifndef GL_BGRA
#define GL_BGRA 0x80E1