Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
52625179
Commit
52625179
authored
Feb 13, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* revert unaccelerated OpenGL. it's useless :D
parent
921de760
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
21 deletions
+13
-21
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+13
-21
No files found.
modules/gui/macosx/voutgl.m
View file @
52625179
...
...
@@ -58,7 +58,6 @@ struct vout_sys_t
VLCGLView
*
o_glview
;
VLCVoutView
*
o_vout_view
;
vlc_bool_t
b_saved_frame
;
vlc_bool_t
b_accelerated
;
NSRect
s_frame
;
vlc_bool_t
b_got_frame
;
vlc_mutex_t
lock
;
...
...
@@ -80,6 +79,13 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
{
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
p_this
;
if
(
!
CGDisplayUsesOpenGLAcceleration
(
kCGDirectMainDisplay
)
)
{
msg_Warn
(
p_vout
,
"no hardware acceleration"
);
return
(
1
);
}
msg_Dbg
(
p_vout
,
"display is Quartz Extreme accelerated"
);
p_vout
->
p_sys
=
malloc
(
sizeof
(
vout_sys_t
)
);
if
(
p_vout
->
p_sys
==
NULL
)
{
...
...
@@ -89,10 +95,6 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
memset
(
p_vout
->
p_sys
,
0
,
sizeof
(
vout_sys_t
)
);
p_vout
->
p_sys
->
b_accelerated
=
CGDisplayUsesOpenGLAcceleration
(
kCGDirectMainDisplay
);
if
(
p_vout
->
p_sys
->
b_accelerated
)
msg_Dbg
(
p_vout
,
"display is Quartz Extreme accelerated"
);
p_vout
->
p_sys
->
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
vlc_mutex_init
(
p_vout
,
&
p_vout
->
p_sys
->
lock
);
...
...
@@ -101,6 +103,7 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
[
p_vout
->
p_sys
->
o_glview
autorelease
];
/* Spawn the window */
if
(
!
(
p_vout
->
p_sys
->
o_vout_view
=
[
VLCVoutView
getVoutView
:
p_vout
subView:
p_vout
->
p_sys
->
o_glview
frame
:
nil
])
)
{
...
...
@@ -238,19 +241,11 @@ static void Unlock( vout_thread_t * p_vout )
-
(
id
)
initWithVout
:
(
vout_thread_t
*
)
vout
{
NSOpenGLPixelFormat
*
fmt
;
NSOpenGLPixelFormatAttribute
attribs_accel
[]
=
{
NSOpenGLPFAAccelerated
,
NSOpenGLPFANoRecovery
,
NSOpenGLPFAColorSize
,
24
,
NSOpenGLPFAAlphaSize
,
8
,
NSOpenGLPFADepthSize
,
24
,
NSOpenGLPFAWindow
,
0
};
p_vout
=
vout
;
NSOpenGLPixelFormatAttribute
attribs
[]
=
{
NSOpenGLPFAAccelerated
,
NSOpenGLPFANoRecovery
,
NSOpenGLPFAColorSize
,
24
,
NSOpenGLPFAAlphaSize
,
8
,
...
...
@@ -259,11 +254,8 @@ static void Unlock( vout_thread_t * p_vout )
0
};
p_vout
=
vout
;
if
(
p_vout
->
p_sys
->
b_accelerated
)
fmt
=
[[
NSOpenGLPixelFormat
alloc
]
initWithAttributes
:
attribs_accel
];
else
fmt
=
[[
NSOpenGLPixelFormat
alloc
]
initWithAttributes
:
attribs
];
NSOpenGLPixelFormat
*
fmt
=
[[
NSOpenGLPixelFormat
alloc
]
initWithAttributes:
attribs
];
if
(
!
fmt
)
{
...
...
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