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
86348530
Commit
86348530
authored
Sep 07, 2011
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl: re-enable the mac part by default
parent
4e84f81b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
modules/video_output/opengl.c
modules/video_output/opengl.c
+9
-9
No files found.
modules/video_output/opengl.c
View file @
86348530
...
@@ -208,7 +208,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -208,7 +208,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl
->
tex_format
=
GL_RGB
;
vgl
->
tex_format
=
GL_RGB
;
vgl
->
tex_internal
=
GL_RGB
;
vgl
->
tex_internal
=
GL_RGB
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_5_6_5
;
vgl
->
tex_type
=
GL_UNSIGNED_SHORT_5_6_5
;
#elif defined(
BROKEN_
MACOS_OPENGL)
#elif defined(MACOS_OPENGL)
# if defined(WORDS_BIGENDIAN)
# if defined(WORDS_BIGENDIAN)
vgl
->
fmt
.
i_chroma
=
VLC_CODEC_YUYV
;
vgl
->
fmt
.
i_chroma
=
VLC_CODEC_YUYV
;
# else
# else
...
@@ -272,7 +272,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -272,7 +272,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
bool
supports_npot
=
false
;
bool
supports_npot
=
false
;
#if USE_OPENGL_ES == 2
#if USE_OPENGL_ES == 2
supports_npot
=
true
;
supports_npot
=
true
;
#elif defined(
BROKEN_
MACOS_OPENGL)
#elif defined(MACOS_OPENGL)
supports_npot
=
true
;
supports_npot
=
true
;
#else
#else
supports_npot
|=
HasExtension
(
extensions
,
"GL_APPLE_texture_2D_limited_npot"
)
||
supports_npot
|=
HasExtension
(
extensions
,
"GL_APPLE_texture_2D_limited_npot"
)
||
...
@@ -395,7 +395,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -395,7 +395,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
*
fmt
=
vgl
->
fmt
;
*
fmt
=
vgl
->
fmt
;
if
(
subpicture_chromas
)
{
if
(
subpicture_chromas
)
{
*
subpicture_chromas
=
NULL
;
*
subpicture_chromas
=
NULL
;
#if !defined(
BROKEN_
MACOS_OPENGL) && !USE_OPENGL_ES
#if !defined(MACOS_OPENGL) && !USE_OPENGL_ES
if
(
supports_npot
)
if
(
supports_npot
)
*
subpicture_chromas
=
gl_subpicture_chromas
;
*
subpicture_chromas
=
gl_subpicture_chromas
;
#endif
#endif
...
@@ -428,7 +428,7 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
...
@@ -428,7 +428,7 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
free
(
vgl
);
free
(
vgl
);
}
}
#ifdef
BROKEN_
MACOS_OPENGL
#ifdef MACOS_OPENGL
struct
picture_sys_t
{
struct
picture_sys_t
{
vout_display_opengl_t
*
vgl
;
vout_display_opengl_t
*
vgl
;
GLuint
*
texture
;
GLuint
*
texture
;
...
@@ -477,7 +477,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
...
@@ -477,7 +477,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
if
(
!
picture
[
count
])
if
(
!
picture
[
count
])
break
;
break
;
#ifdef
BROKEN_
MACOS_OPENGL
#ifdef MACOS_OPENGL
picture_sys_t
*
sys
=
picture
[
count
]
->
p_sys
=
malloc
(
sizeof
(
*
sys
));
picture_sys_t
*
sys
=
picture
[
count
]
->
p_sys
=
malloc
(
sizeof
(
*
sys
));
if
(
sys
)
{
if
(
sys
)
{
sys
->
vgl
=
vgl
;
sys
->
vgl
=
vgl
;
...
@@ -493,7 +493,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
...
@@ -493,7 +493,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
memset
(
&
cfg
,
0
,
sizeof
(
cfg
));
memset
(
&
cfg
,
0
,
sizeof
(
cfg
));
cfg
.
picture_count
=
count
;
cfg
.
picture_count
=
count
;
cfg
.
picture
=
picture
;
cfg
.
picture
=
picture
;
#ifdef
BROKEN_
MACOS_OPENGL
#ifdef MACOS_OPENGL
cfg
.
lock
=
PictureLock
;
cfg
.
lock
=
PictureLock
;
cfg
.
unlock
=
PictureUnlock
;
cfg
.
unlock
=
PictureUnlock
;
#endif
#endif
...
@@ -524,7 +524,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
...
@@ -524,7 +524,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
glTexParameteri
(
vgl
->
tex_target
,
GL_TEXTURE_WRAP_S
,
GL_CLAMP_TO_EDGE
);
glTexParameteri
(
vgl
->
tex_target
,
GL_TEXTURE_WRAP_S
,
GL_CLAMP_TO_EDGE
);
glTexParameteri
(
vgl
->
tex_target
,
GL_TEXTURE_WRAP_T
,
GL_CLAMP_TO_EDGE
);
glTexParameteri
(
vgl
->
tex_target
,
GL_TEXTURE_WRAP_T
,
GL_CLAMP_TO_EDGE
);
#ifdef
BROKEN_
MACOS_OPENGL
#ifdef MACOS_OPENGL
/* Tell the driver not to make a copy of the texture but to use
/* Tell the driver not to make a copy of the texture but to use
our buffer */
our buffer */
glEnable
(
GL_UNPACK_CLIENT_STORAGE_APPLE
);
glEnable
(
GL_UNPACK_CLIENT_STORAGE_APPLE
);
...
@@ -576,7 +576,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
...
@@ -576,7 +576,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
if
(
vlc_gl_Lock
(
vgl
->
gl
))
if
(
vlc_gl_Lock
(
vgl
->
gl
))
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
#ifdef
BROKEN_
MACOS_OPENGL
#ifdef MACOS_OPENGL
/* Bind to the texture for drawing */
/* Bind to the texture for drawing */
glBindTexture
(
vgl
->
tex_target
,
PictureGetTexture
(
picture
));
glBindTexture
(
vgl
->
tex_target
,
PictureGetTexture
(
picture
));
#else
#else
...
@@ -738,7 +738,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
...
@@ -738,7 +738,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
glDrawArrays
(
GL_TRIANGLE_STRIP
,
0
,
4
);
glDrawArrays
(
GL_TRIANGLE_STRIP
,
0
,
4
);
#else
#else
#if !defined(
BROKEN_
MACOS_OPENGL)
#if !defined(MACOS_OPENGL)
for
(
unsigned
j
=
0
;
j
<
vgl
->
chroma
->
plane_count
;
j
++
)
{
for
(
unsigned
j
=
0
;
j
<
vgl
->
chroma
->
plane_count
;
j
++
)
{
if
(
vgl
->
use_multitexture
)
if
(
vgl
->
use_multitexture
)
vgl
->
ActiveTextureARB
(
GL_TEXTURE0_ARB
+
j
);
vgl
->
ActiveTextureARB
(
GL_TEXTURE0_ARB
+
j
);
...
...
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