Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
06c5a102
Commit
06c5a102
authored
Aug 24, 2015
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout ios: minor clean-up
parent
0c79ec9b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
modules/video_output/ios2.m
modules/video_output/ios2.m
+2
-6
No files found.
modules/video_output/ios2.m
View file @
06c5a102
/*****************************************************************************
* ios2.m: iOS OpenGL ES 2 provider
*****************************************************************************
* Copyright (C) 2001-201
4
VLC authors and VideoLAN
* Copyright (C) 2001-201
5
VLC authors and VideoLAN
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont at videolan dot org>
...
...
@@ -168,9 +168,6 @@ vlc_module_end ()
CVOpenGLESTextureRef
_lumaTexture
;
CVOpenGLESTextureRef
_chromaTexture
;
GLint
_backingWidth
;
GLint
_backingHeight
;
const
GLfloat
*
_preferredConversion
;
}
@property
(
readonly
)
GLuint
renderBuffer
;
...
...
@@ -622,8 +619,6 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
glBindRenderbuffer
(
GL_RENDERBUFFER
,
_renderBuffer
);
[
_eaglContext
renderbufferStorage
:
GL_RENDERBUFFER
fromDrawable
:(
CAEAGLLayer
*
)
self
.
layer
];
glGetRenderbufferParameteriv
(
GL_RENDERBUFFER
,
GL_RENDERBUFFER_WIDTH
,
&
_backingWidth
);
glGetRenderbufferParameteriv
(
GL_RENDERBUFFER
,
GL_RENDERBUFFER_HEIGHT
,
&
_backingHeight
);
glFramebufferRenderbuffer
(
GL_FRAMEBUFFER
,
GL_COLOR_ATTACHMENT0
,
GL_RENDERBUFFER
,
_renderBuffer
);
if
(
glCheckFramebufferStatus
(
GL_FRAMEBUFFER
)
!=
GL_FRAMEBUFFER_COMPLETE
)
{
...
...
@@ -657,6 +652,7 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
-
(
void
)
layoutSubviews
{
[
self
reshape
];
if
(
_zeroCopy
)
{
/* we don't have a clean event for 0-copy, so destory and re-create right here */
[
self
destroyBuffers
];
...
...
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