Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
a159d154
Commit
a159d154
authored
May 05, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EGL: update and unify the platforms list
parent
dc5988ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
7 deletions
+23
-7
modules/video_output/egl.c
modules/video_output/egl.c
+23
-7
No files found.
modules/video_output/egl.c
View file @
a159d154
...
...
@@ -109,12 +109,33 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
{
vlc_gl_t
*
gl
=
(
vlc_gl_t
*
)
obj
;
#ifdef __unix__
/* <EGL/eglplatform.h> defines the list and order of platforms */
#if defined(_WIN32) || defined(__VC32__) \
&& !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
# define vlc_eglGetWindow(w) ((w)->handle.hwnd)
#elif defined(__WINSCW__) || defined(__SYMBIAN32__)
/* Symbian */
# error Symbian EGL not supported.
#elif defined(WL_EGL_PLATFORM)
# error Wayland EGL not supported.
#elif defined(__GBM__)
# error Glamor EGL not supported.
#elif defined(ANDROID)
# error Android EGL not supported
#elif defined(__unix__)
/* X11 */
# define vlc_eglGetWindow(w) ((w)->handle.xid)
/* EGL can only use the default X11 display */
if
(
gl
->
surface
->
display
.
x11
!=
NULL
)
return
VLC_EGENERIC
;
if
(
!
vlc_xlib_init
(
obj
))
return
VLC_EGENERIC
;
#else
# error EGL platform not recognized.
#endif
/* Initialize EGL display */
...
...
@@ -163,12 +184,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
goto
error
;
/* Create a drawing surface */
#if defined (WIN32)
EGLNativeWindowType
win
=
gl
->
surface
->
handle
.
hwnd
;
#elif defined (__unix__)
EGLNativeWindowType
win
=
gl
->
surface
->
handle
.
xid
;
#endif
EGLNativeWindowType
win
=
vlc_eglGetWindow
(
gl
->
surface
);
EGLSurface
surface
=
eglCreateWindowSurface
(
dpy
,
cfgv
[
0
],
win
,
NULL
);
if
(
surface
==
EGL_NO_SURFACE
)
{
...
...
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