[vlc-commits] vout ios: minor clean-up
Felix Paul Kühne
git at videolan.org
Mon Aug 24 15:38:34 CEST 2015
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug 24 14:43:04 2015 +0200| [06c5a1027d3c340f20a7913a8187ca3388d2f38a] | committer: Felix Paul Kühne
vout ios: minor clean-up
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06c5a1027d3c340f20a7913a8187ca3388d2f38a
---
modules/video_output/ios2.m | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 9b6af3a..db4a743 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -1,7 +1,7 @@
/*****************************************************************************
* ios2.m: iOS OpenGL ES 2 provider
*****************************************************************************
- * Copyright (C) 2001-2014 VLC authors and VideoLAN
+ * Copyright (C) 2001-2015 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];
More information about the vlc-commits
mailing list