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
c44ee8e1
Commit
c44ee8e1
authored
Sep 05, 2011
by
Sebastien Zwickert
Committed by
Felix Paul Kühne
Sep 05, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl: fixes macosx vout issue.
Signed-off-by:
Felix Paul Kühne
<
fkuehne@videolan.org
>
parent
67b1aab7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
modules/video_output/opengl.c
modules/video_output/opengl.c
+5
-2
No files found.
modules/video_output/opengl.c
View file @
c44ee8e1
...
...
@@ -216,7 +216,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
# endif
vgl
->
tex_target
=
GL_TEXTURE_RECTANGLE_EXT
;
vgl
->
tex_format
=
GL_YCBCR_422_APPLE
;
vgl
->
tex_internal
=
GL_
YCBCR_422_APPLE
;
vgl
->
tex_internal
=
GL_
RGBA
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_8_8_APPLE
;
#else
vgl
->
fmt
.
i_chroma
=
VLC_CODEC_RGB32
;
...
...
@@ -506,6 +506,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
for
(
int
i
=
0
;
i
<
VLCGL_TEXTURE_COUNT
;
i
++
)
{
glGenTextures
(
vgl
->
chroma
->
plane_count
,
vgl
->
texture
[
i
]);
for
(
unsigned
j
=
0
;
j
<
vgl
->
chroma
->
plane_count
;
j
++
)
{
uint8_t
*
buffer
=
NULL
;
if
(
vgl
->
use_multitexture
)
vgl
->
ActiveTextureARB
(
GL_TEXTURE0_ARB
+
j
);
glBindTexture
(
vgl
->
tex_target
,
vgl
->
texture
[
i
][
j
]);
...
...
@@ -527,6 +528,8 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
glEnable
(
GL_UNPACK_CLIENT_STORAGE_APPLE
);
glPixelStorei
(
GL_UNPACK_CLIENT_STORAGE_APPLE
,
GL_TRUE
);
buffer
=
picture
[
i
]
->
p
[
j
].
p_pixels
;
/* Use AGP texturing */
glTexParameteri
(
vgl
->
tex_target
,
GL_TEXTURE_STORAGE_HINT_APPLE
,
GL_STORAGE_SHARED_APPLE
);
...
...
@@ -535,7 +538,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
/* Call glTexImage2D only once, and use glTexSubImage2D later */
glTexImage2D
(
vgl
->
tex_target
,
0
,
vgl
->
tex_internal
,
vgl
->
tex_width
[
j
],
vgl
->
tex_height
[
j
],
0
,
vgl
->
tex_format
,
vgl
->
tex_type
,
NULL
);
0
,
vgl
->
tex_format
,
vgl
->
tex_type
,
buffer
);
}
}
...
...
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