Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
86a7523d
Commit
86a7523d
authored
May 28, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepare for fragment program support in opengl.
parent
6a36c6c0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
60 additions
and
3 deletions
+60
-3
modules/video_output/opengl.c
modules/video_output/opengl.c
+60
-3
No files found.
modules/video_output/opengl.c
View file @
86a7523d
...
@@ -109,6 +109,14 @@ struct vout_display_opengl_t {
...
@@ -109,6 +109,14 @@ struct vout_display_opengl_t {
void
*
buffer_base
[
VLCGL_TEXTURE_COUNT
];
void
*
buffer_base
[
VLCGL_TEXTURE_COUNT
];
picture_pool_t
*
pool
;
picture_pool_t
*
pool
;
GLuint
program
;
/* fragment_program */
void
(
*
GenProgramsARB
)(
GLuint
,
GLuint
*
);
void
(
*
BindProgramARB
)(
GLuint
,
GLuint
);
void
(
*
ProgramStringARB
)(
GLuint
,
GLuint
,
GLint
,
const
GLbyte
*
);
void
(
*
DeleteProgramsARB
)(
GLuint
,
GLuint
*
);
};
};
static
inline
int
GetAlignedSize
(
unsigned
size
)
static
inline
int
GetAlignedSize
(
unsigned
size
)
...
@@ -121,7 +129,7 @@ static inline int GetAlignedSize(unsigned size)
...
@@ -121,7 +129,7 @@ static inline int GetAlignedSize(unsigned size)
vout_display_opengl_t
*
vout_display_opengl_New
(
video_format_t
*
fmt
,
vout_display_opengl_t
*
vout_display_opengl_New
(
video_format_t
*
fmt
,
vlc_gl_t
*
gl
)
vlc_gl_t
*
gl
)
{
{
vout_display_opengl_t
*
vgl
=
malloc
(
sizeof
(
*
vgl
));
vout_display_opengl_t
*
vgl
=
calloc
(
1
,
sizeof
(
*
vgl
));
if
(
!
vgl
)
if
(
!
vgl
)
return
NULL
;
return
NULL
;
...
@@ -135,6 +143,20 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -135,6 +143,20 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
if
(
!
extensions
)
if
(
!
extensions
)
extensions
=
""
;
extensions
=
""
;
/* Load extensions */
bool
supports_fp
=
false
;
if
(
strstr
(
extensions
,
"GL_ARB_fragment_program"
))
{
vgl
->
GenProgramsARB
=
(
void
(
*
)(
GLuint
,
GLuint
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glGenProgramsARB"
);
vgl
->
BindProgramARB
=
(
void
(
*
)(
GLuint
,
GLuint
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glBindProgramARB"
);
vgl
->
ProgramStringARB
=
(
void
(
*
)(
GLuint
,
GLuint
,
GLint
,
const
GLbyte
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glProgramStringARB"
);
vgl
->
DeleteProgramsARB
=
(
void
(
*
)(
GLuint
,
GLuint
*
))
vlc_gl_GetProcAddress
(
vgl
->
gl
,
"glDeleteProgramsARB"
);
supports_fp
=
vgl
->
GenProgramsARB
&&
vgl
->
BindProgramARB
&&
vgl
->
ProgramStringARB
&&
vgl
->
DeleteProgramsARB
;
}
/* Find the chroma we will use and update fmt */
/* Find the chroma we will use and update fmt */
vgl
->
fmt
=
*
fmt
;
vgl
->
fmt
=
*
fmt
;
/* TODO: We use YCbCr on Mac which is Y422, but on OSX it seems to == YUY2. Verify */
/* TODO: We use YCbCr on Mac which is Y422, but on OSX it seems to == YUY2. Verify */
...
@@ -202,6 +224,32 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -202,6 +224,32 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl
->
tex_height
=
GetAlignedSize
(
vgl
->
fmt
.
i_height
);
vgl
->
tex_height
=
GetAlignedSize
(
vgl
->
fmt
.
i_height
);
}
}
/* Build fragment program if needed */
vgl
->
program
=
0
;
if
(
supports_fp
)
{
char
*
code
=
NULL
;
if
(
code
)
{
vgl
->
GenProgramsARB
(
1
,
&
vgl
->
program
);
vgl
->
BindProgramARB
(
GL_FRAGMENT_PROGRAM_ARB
,
vgl
->
program
);
vgl
->
ProgramStringARB
(
GL_FRAGMENT_PROGRAM_ARB
,
GL_PROGRAM_FORMAT_ASCII_ARB
,
strlen
(
code
),
(
const
GLbyte
*
)
code
);
if
(
glGetError
()
==
GL_INVALID_OPERATION
)
{
/* FIXME if the program was needed for YUV, the video will be broken */
#if 1
GLint
position
;
glGetIntegerv
(
GL_PROGRAM_ERROR_POSITION_ARB
,
&
position
);
const
char
*
msg
=
(
const
char
*
)
glGetString
(
GL_PROGRAM_ERROR_STRING_ARB
);
fprintf
(
stderr
,
"GL_INVALID_OPERATION: error at %d: %s
\n
"
,
position
,
msg
);
#endif
vgl
->
DeleteProgramsARB
(
1
,
&
vgl
->
program
);
vgl
->
program
=
0
;
}
free
(
code
);
}
}
/* */
/* */
glDisable
(
GL_BLEND
);
glDisable
(
GL_BLEND
);
glDisable
(
GL_DEPTH_TEST
);
glDisable
(
GL_DEPTH_TEST
);
...
@@ -233,6 +281,9 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
...
@@ -233,6 +281,9 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
glFlush
();
glFlush
();
glDeleteTextures
(
VLCGL_TEXTURE_COUNT
,
vgl
->
texture
);
glDeleteTextures
(
VLCGL_TEXTURE_COUNT
,
vgl
->
texture
);
if
(
vgl
->
program
)
vgl
->
DeleteProgramsARB
(
1
,
&
vgl
->
program
);
vlc_gl_Unlock
(
vgl
->
gl
);
vlc_gl_Unlock
(
vgl
->
gl
);
}
}
if
(
vgl
->
pool
)
{
if
(
vgl
->
pool
)
{
...
@@ -453,7 +504,10 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
...
@@ -453,7 +504,10 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
glClear
(
GL_COLOR_BUFFER_BIT
);
glClear
(
GL_COLOR_BUFFER_BIT
);
glEnable
(
VLCGL_TARGET
);
if
(
vgl
->
program
)
glEnable
(
GL_FRAGMENT_PROGRAM_ARB
);
else
glEnable
(
VLCGL_TARGET
);
#if USE_OPENGL_ES
#if USE_OPENGL_ES
static
const
GLfloat
vertexCoord
[]
=
{
static
const
GLfloat
vertexCoord
[]
=
{
...
@@ -485,7 +539,10 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
...
@@ -485,7 +539,10 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
glEnd
();
glEnd
();
#endif
#endif
glDisable
(
VLCGL_TARGET
);
if
(
vgl
->
program
)
glDisable
(
GL_FRAGMENT_PROGRAM_ARB
);
else
glDisable
(
VLCGL_TARGET
);
vlc_gl_Swap
(
vgl
->
gl
);
vlc_gl_Swap
(
vgl
->
gl
);
...
...
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