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
09a32ed3
Commit
09a32ed3
authored
May 29, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some functions prototypes in opengl.
parent
cd781fa6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
modules/video_output/opengl.c
modules/video_output/opengl.c
+10
-10
No files found.
modules/video_output/opengl.c
View file @
09a32ed3
...
@@ -97,13 +97,13 @@ struct vout_display_opengl_t {
...
@@ -97,13 +97,13 @@ struct vout_display_opengl_t {
GLuint
program
;
GLuint
program
;
/* fragment_program */
/* fragment_program */
void
(
*
GenProgramsARB
)(
GL
uint
,
GLuint
*
);
void
(
*
GenProgramsARB
)(
GL
sizei
,
GLuint
*
);
void
(
*
BindProgramARB
)(
GL
uint
,
GLuint
);
void
(
*
BindProgramARB
)(
GL
enum
,
GLuint
);
void
(
*
ProgramStringARB
)(
GL
uint
,
GLuint
,
GLint
,
const
GLbyte
*
);
void
(
*
ProgramStringARB
)(
GL
enum
,
GLenum
,
GLsizei
,
const
GLvoid
*
);
void
(
*
DeleteProgramsARB
)(
GL
uint
,
GLuint
*
);
void
(
*
DeleteProgramsARB
)(
GL
sizei
,
const
GLuint
*
);
/* multitexture */
/* multitexture */
void
(
*
ActiveTextureARB
)(
GL
uint
);
void
(
*
ActiveTextureARB
)(
GL
enum
);
void
(
*
MultiTexCoord2fARB
)(
GLenum
,
GLfloat
,
GLfloat
);
void
(
*
MultiTexCoord2fARB
)(
GLenum
,
GLfloat
,
GLfloat
);
};
};
...
@@ -134,10 +134,10 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -134,10 +134,10 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
/* Load extensions */
/* Load extensions */
bool
supports_fp
=
false
;
bool
supports_fp
=
false
;
if
(
strstr
(
extensions
,
"GL_ARB_fragment_program"
))
{
if
(
strstr
(
extensions
,
"GL_ARB_fragment_program"
))
{
vgl
->
GenProgramsARB
=
(
void
(
*
)(
GL
uint
,
GLuint
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glGenProgramsARB"
);
vgl
->
GenProgramsARB
=
(
void
(
*
)(
GL
sizei
,
GLuint
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glGenProgramsARB"
);
vgl
->
BindProgramARB
=
(
void
(
*
)(
GL
uint
,
GLuint
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glBindProgramARB"
);
vgl
->
BindProgramARB
=
(
void
(
*
)(
GL
enum
,
GLuint
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glBindProgramARB"
);
vgl
->
ProgramStringARB
=
(
void
(
*
)(
GL
uint
,
GLuint
,
GLint
,
const
GLbyte
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glProgramStringARB"
);
vgl
->
ProgramStringARB
=
(
void
(
*
)(
GL
enum
,
GLenum
,
GLsizei
,
const
GLvoid
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glProgramStringARB"
);
vgl
->
DeleteProgramsARB
=
(
void
(
*
)(
GL
uint
,
GLuint
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glDeleteProgramsARB"
);
vgl
->
DeleteProgramsARB
=
(
void
(
*
)(
GL
sizei
,
const
GLuint
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glDeleteProgramsARB"
);
supports_fp
=
vgl
->
GenProgramsARB
&&
supports_fp
=
vgl
->
GenProgramsARB
&&
vgl
->
BindProgramARB
&&
vgl
->
BindProgramARB
&&
...
@@ -146,7 +146,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -146,7 +146,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
}
}
bool
supports_multitexture
=
false
;
bool
supports_multitexture
=
false
;
if
(
strstr
(
extensions
,
"GL_ARB_multitexture"
))
{
if
(
strstr
(
extensions
,
"GL_ARB_multitexture"
))
{
vgl
->
ActiveTextureARB
=
(
void
(
*
)(
GL
uint
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glActiveTextureARB"
);
vgl
->
ActiveTextureARB
=
(
void
(
*
)(
GL
enum
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glActiveTextureARB"
);
vgl
->
MultiTexCoord2fARB
=
(
void
(
*
)(
GLenum
,
GLfloat
,
GLfloat
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glMultiTexCoord2fARB"
);
vgl
->
MultiTexCoord2fARB
=
(
void
(
*
)(
GLenum
,
GLfloat
,
GLfloat
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glMultiTexCoord2fARB"
);
supports_multitexture
=
vgl
->
ActiveTextureARB
&&
supports_multitexture
=
vgl
->
ActiveTextureARB
&&
...
...
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