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
e3fc9953
Commit
e3fc9953
authored
Jun 30, 2012
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl: add check for opengl >= 2.0
parent
8ca057e9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
modules/video_output/opengl.c
modules/video_output/opengl.c
+7
-5
No files found.
modules/video_output/opengl.c
View file @
e3fc9953
...
@@ -241,7 +241,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -241,7 +241,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
}
}
bool
supports_fp
=
true
;
const
char
*
ogl_version
=
glGetString
(
GL_VERSION
);
float
f_ogl_version
=
atof
(
ogl_version
);
bool
supports_shaders
=
f_ogl_version
>=
2
.
0
f
;
GLint
max_texture_units
=
0
;
GLint
max_texture_units
=
0
;
glGetIntegerv
(
GL_MAX_TEXTURE_IMAGE_UNITS
,
&
max_texture_units
);
glGetIntegerv
(
GL_MAX_TEXTURE_IMAGE_UNITS
,
&
max_texture_units
);
...
@@ -281,7 +283,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -281,7 +283,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
/* Use YUV if possible and needed */
/* Use YUV if possible and needed */
bool
need_fs_yuv
=
false
;
bool
need_fs_yuv
=
false
;
float
yuv_range_correction
=
1
.
0
;
float
yuv_range_correction
=
1
.
0
;
if
(
max_texture_units
>=
3
&&
if
(
max_texture_units
>=
3
&&
supports_shaders
&&
vlc_fourcc_IsYUV
(
fmt
->
i_chroma
)
&&
!
vlc_fourcc_IsYUV
(
vgl
->
fmt
.
i_chroma
))
{
vlc_fourcc_IsYUV
(
fmt
->
i_chroma
)
&&
!
vlc_fourcc_IsYUV
(
vgl
->
fmt
.
i_chroma
))
{
const
vlc_fourcc_t
*
list
=
vlc_fourcc_GetYUVFallback
(
fmt
->
i_chroma
);
const
vlc_fourcc_t
*
list
=
vlc_fourcc_GetYUVFallback
(
fmt
->
i_chroma
);
while
(
*
list
)
{
while
(
*
list
)
{
...
@@ -360,7 +362,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -360,7 +362,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
if
(
!
vgl
->
CreateShader
||
!
vgl
->
ShaderSource
||
!
vgl
->
CreateProgram
)
if
(
!
vgl
->
CreateShader
||
!
vgl
->
ShaderSource
||
!
vgl
->
CreateProgram
)
{
{
fprintf
(
stderr
,
"Looks like you don't have all the opengl we need
, only
%s, giving up
\n
"
,
glGetString
(
GL_VERSION
));
fprintf
(
stderr
,
"Looks like you don't have all the opengl we need
. Driver is
%s, giving up
\n
"
,
glGetString
(
GL_VERSION
));
free
(
vgl
);
free
(
vgl
);
return
NULL
;
return
NULL
;
}
}
...
@@ -379,7 +381,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -379,7 +381,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl
->
program
[
1
]
=
0
;
vgl
->
program
[
1
]
=
0
;
vgl
->
local_count
=
0
;
vgl
->
local_count
=
0
;
vgl
->
shader
[
0
]
=
vgl
->
shader
[
1
]
=
vgl
->
shader
[
2
]
=
-
1
;
vgl
->
shader
[
0
]
=
vgl
->
shader
[
1
]
=
vgl
->
shader
[
2
]
=
-
1
;
if
(
supports_
fp
)
{
if
(
supports_
shaders
)
{
char
*
code
=
NULL
;
char
*
code
=
NULL
;
/* [R/G/B][Y U V O] from TV range to full range
/* [R/G/B][Y U V O] from TV range to full range
...
@@ -515,7 +517,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -515,7 +517,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
if
(
link_status
==
GL_FALSE
)
if
(
link_status
==
GL_FALSE
)
{
{
msg_Err
(
vgl
->
gl
,
"Unable to use program %d"
,
i
);
fprintf
(
stderr
,
"Unable to use program %d"
,
i
);
free
(
vgl
);
free
(
vgl
);
return
NULL
;
return
NULL
;
}
}
...
...
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