Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
b370fad7
Commit
b370fad7
authored
Jun 30, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout/opengl: cleanup the Mac includes
parent
729d3528
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
15 deletions
+12
-15
modules/video_output/opengl.h
modules/video_output/opengl.h
+12
-15
No files found.
modules/video_output/opengl.h
View file @
b370fad7
...
@@ -29,18 +29,24 @@
...
@@ -29,18 +29,24 @@
#include <vlc_picture_pool.h>
#include <vlc_picture_pool.h>
#include <vlc_opengl.h>
#include <vlc_opengl.h>
// Define USE_OPENGL_ES to the GL ES Version you want to select
#ifndef USE_OPENGL_ES
# define USE_OPENGL_ES 0
#endif
#ifdef __APPLE__
#ifdef __APPLE__
# include "TargetConditionals.h"
# include "TargetConditionals.h"
# if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
# if defined(TARGET_OS_MAC)
# define MACOS_OPENGL
# include <OpenGL/gl.h>
# else
# define USE_OPENGL_ES 1
# define USE_OPENGL_ES 1
# include <OpenGLES/ES1/gl.h>
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
# endif
# endif
#endif
#endif
// Define USE_OPENGL_ES to the GL ES Version you want to select
#ifndef USE_OPENGL_ES
# define USE_OPENGL_ES 0
#endif
#if !defined (__APPLE__)
#if !defined (__APPLE__)
# if USE_OPENGL_ES == 2
# if USE_OPENGL_ES == 2
# include <GLES2/gl2.h>
# include <GLES2/gl2.h>
...
@@ -54,15 +60,6 @@
...
@@ -54,15 +60,6 @@
# endif
# endif
# include <GL/gl.h>
# include <GL/gl.h>
# endif
# endif
#else
# if !USE_OPENGL_ES
# define MACOS_OPENGL
# include <OpenGL/gl.h>
# else
# include <OpenGLES/ES1/gl.h>
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
# endif
#endif
#endif
static
inline
bool
HasExtension
(
const
char
*
apis
,
const
char
*
api
)
static
inline
bool
HasExtension
(
const
char
*
apis
,
const
char
*
api
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment