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
bde18225
Commit
bde18225
authored
Jun 01, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EGL: avoid clash with Win32 API
parent
6f1f23fb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
modules/video_output/egl.c
modules/video_output/egl.c
+3
-3
No files found.
modules/video_output/egl.c
View file @
bde18225
...
@@ -70,7 +70,7 @@ typedef struct vlc_gl_sys_t
...
@@ -70,7 +70,7 @@ typedef struct vlc_gl_sys_t
/* OpenGL callbacks */
/* OpenGL callbacks */
static
int
MakeCurrent
(
vlc_gl_t
*
);
static
int
MakeCurrent
(
vlc_gl_t
*
);
static
void
SwapBuffers
(
vlc_gl_t
*
);
static
void
SwapBuffers
(
vlc_gl_t
*
);
static
void
*
Get
ProcAddress
(
vlc_gl_t
*
,
const
char
*
);
static
void
*
Get
Symbol
(
vlc_gl_t
*
,
const
char
*
);
static
bool
CheckAPI
(
EGLDisplay
dpy
,
const
char
*
api
)
static
bool
CheckAPI
(
EGLDisplay
dpy
,
const
char
*
api
)
{
{
...
@@ -194,7 +194,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
...
@@ -194,7 +194,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
gl
->
sys
=
sys
;
gl
->
sys
=
sys
;
gl
->
makeCurrent
=
MakeCurrent
;
gl
->
makeCurrent
=
MakeCurrent
;
gl
->
swap
=
SwapBuffers
;
gl
->
swap
=
SwapBuffers
;
gl
->
getProcAddress
=
Get
ProcAddress
;
gl
->
getProcAddress
=
Get
Symbol
;
gl
->
lock
=
NULL
;
gl
->
lock
=
NULL
;
gl
->
unlock
=
NULL
;
gl
->
unlock
=
NULL
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
@@ -257,7 +257,7 @@ static void SwapBuffers (vlc_gl_t *gl)
...
@@ -257,7 +257,7 @@ static void SwapBuffers (vlc_gl_t *gl)
eglSwapBuffers
(
sys
->
display
,
sys
->
surface
);
eglSwapBuffers
(
sys
->
display
,
sys
->
surface
);
}
}
static
void
*
Get
ProcAddress
(
vlc_gl_t
*
gl
,
const
char
*
procname
)
static
void
*
Get
Symbol
(
vlc_gl_t
*
gl
,
const
char
*
procname
)
{
{
(
void
)
gl
;
(
void
)
gl
;
return
(
void
*
)
eglGetProcAddress
(
procname
);
return
(
void
*
)
eglGetProcAddress
(
procname
);
...
...
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