mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

[623/906] move GL includes into a single file

Browse source
This commit is contained in:
Matthew Waters 2012-12-06 17:40:47 +11:00 committed by Tim-Philipp Müller
parent 4e46ef4a3f
commit ee992ec531
9 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.h
View file

@ -23,6 +23,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gstglapi.h"
#include "gstglwindow.h" #include "gstglwindow.h"
G_BEGIN_DECLS G_BEGIN_DECLS

28
gst-libs/gst/gl/gstglapi.h
View file

@ -18,18 +18,19 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __GST_GL_RENDERER_H__ #ifndef __GST_GL_API_H__
#define __GST_GL_RENDERER_H__ #define __GST_GL_API_H__
/* OpenGL 2.0 for Embedded Systems */ /* OpenGL 2.0 for Embedded Systems */
#ifdef HAVE_GLES2 #if HAVE_GLES2
# include <GLES2/gl2.h> # include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
# if !HAVE_OPENGL # if !HAVE_OPENGL
# include "gstgles2.h" # include "gstgles2.h"
# endif # endif
#endif #endif
/* OpenGL for usual systems */ /* OpenGL for desktop systems */
#if HAVE_OPENGL #if HAVE_OPENGL
# if __APPLE__ # if __APPLE__
# include <GL/glew.h> # include <GL/glew.h>
@ -51,6 +52,12 @@
# define UNICODE # define UNICODE
#endif #endif
#if HAVE_WGL
# undef UNICODE
# include <windows.h>
# define UNICODE
#endif
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -69,15 +76,14 @@ typedef enum {
typedef enum typedef enum
{ {
GST_GL_PLATFORM_UNKNOWN = 0, GST_GL_PLATFORM_UNKNOWN = 0,
GST_GL_PLATFORM_EGL, GST_GL_PLATFORM_EGL = (1 << 0),
GST_GL_PLATFORM_GLX, GST_GL_PLATFORM_GLX = (1 << 1),
GST_GL_PLATFORM_WGL, GST_GL_PLATFORM_WGL = (1 << 2),
GST_GL_PLATFORM_CGL, GST_GL_PLATFORM_CGL = (1 << 3),
GST_GL_PLATFORM_ANY = 254, GST_GL_PLATFORM_ANY = G_MAXUINT32
GST_GL_PLATFORM_LAST = 255
} GstGLPlatform; } GstGLPlatform;
G_END_DECLS G_END_DECLS
#endif /* __GST_GL_WINDOW_H__ */ #endif /* __GST_GL_API_H__ */

1
gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
View file

@ -25,6 +25,7 @@
#include <wayland-egl.h> #include <wayland-egl.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>
#include "gstglapi.h"
#include "gstglwindow.h" #include "gstglwindow.h"
G_BEGIN_DECLS G_BEGIN_DECLS

1
gst-libs/gst/gl/win32/gstglwindow_win32.h
View file

@ -21,6 +21,7 @@
#ifndef __GST_GL_WINDOW_WIN32_H__ #ifndef __GST_GL_WINDOW_WIN32_H__
#define __GST_GL_WINDOW_WIN32_H__ #define __GST_GL_WINDOW_WIN32_H__
#include "gstglapi.h"
#include "gstglwindow.h" #include "gstglwindow.h"
#undef UNICODE #undef UNICODE

3
gst-libs/gst/gl/win32/gstglwindow_win32_egl.h
View file

@ -21,10 +21,9 @@
#ifndef __GST_GL_WINDOW_WIN32_EGL_H__ #ifndef __GST_GL_WINDOW_WIN32_EGL_H__
#define __GST_GL_WINDOW_WIN32_EGL_H__ #define __GST_GL_WINDOW_WIN32_EGL_H__
#include <EGL/egl.h>
#include <gst/gst.h> #include <gst/gst.h>
#include "gstglapi.h"
#include "gstglwindow_win32.h" #include "gstglwindow_win32.h"
G_BEGIN_DECLS G_BEGIN_DECLS

5
gst-libs/gst/gl/win32/gstglwindow_win32_wgl.h
View file

@ -21,12 +21,9 @@
#ifndef __GST_GL_WINDOW_WIN32_WGL_H__ #ifndef __GST_GL_WINDOW_WIN32_WGL_H__
#define __GST_GL_WINDOW_WIN32_WGL_H__ #define __GST_GL_WINDOW_WIN32_WGL_H__
#include "gstglapi.h"
#include "gstglwindow_win32.h" #include "gstglwindow_win32.h"
#undef UNICODE
#include <windows.h>
#define UNICODE
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_GL_TYPE_WINDOW_WIN32_WGL (gst_gl_window_win32_wgl_get_type()) #define GST_GL_TYPE_WINDOW_WIN32_WGL (gst_gl_window_win32_wgl_get_type())

1
gst-libs/gst/gl/x11/gstglwindow_x11.h
View file

@ -24,6 +24,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "gstglapi.h"
#include "gstglwindow.h" #include "gstglwindow.h"
G_BEGIN_DECLS G_BEGIN_DECLS

3
gst-libs/gst/gl/x11/gstglwindow_x11_egl.h
View file

@ -21,8 +21,7 @@
#ifndef __GST_GL_WINDOW_X11_EGL_H__ #ifndef __GST_GL_WINDOW_X11_EGL_H__
#define __GST_GL_WINDOW_X11_EGL_H__ #define __GST_GL_WINDOW_X11_EGL_H__
#include <EGL/egl.h> #include "gstglapi.h"
#include "gstglwindow_x11.h" #include "gstglwindow_x11.h"
G_BEGIN_DECLS G_BEGIN_DECLS

1
gst-libs/gst/gl/x11/gstglwindow_x11_glx.h
View file

@ -21,6 +21,7 @@
#ifndef __GST_GL_WINDOW_X11_GLX_H__ #ifndef __GST_GL_WINDOW_X11_GLX_H__
#define __GST_GL_WINDOW_X11_GLX_H__ #define __GST_GL_WINDOW_X11_GLX_H__
#include "gstglapi.h"
#include "gstglwindow_x11.h" #include "gstglwindow_x11.h"
G_BEGIN_DECLS G_BEGIN_DECLS