Commit 06c5a102 authored by Felix Paul Kühne's avatar Felix Paul Kühne

vout ios: minor clean-up

parent 0c79ec9b
/***************************************************************************** /*****************************************************************************
* ios2.m: iOS OpenGL ES 2 provider * ios2.m: iOS OpenGL ES 2 provider
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2014 VLC authors and VideoLAN * Copyright (C) 2001-2015 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Pierre d'Herbemont <pdherbemont at videolan dot org> * Authors: Pierre d'Herbemont <pdherbemont at videolan dot org>
...@@ -168,9 +168,6 @@ vlc_module_end () ...@@ -168,9 +168,6 @@ vlc_module_end ()
CVOpenGLESTextureRef _lumaTexture; CVOpenGLESTextureRef _lumaTexture;
CVOpenGLESTextureRef _chromaTexture; CVOpenGLESTextureRef _chromaTexture;
GLint _backingWidth;
GLint _backingHeight;
const GLfloat *_preferredConversion; const GLfloat *_preferredConversion;
} }
@property (readonly) GLuint renderBuffer; @property (readonly) GLuint renderBuffer;
...@@ -622,8 +619,6 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su ...@@ -622,8 +619,6 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
glBindRenderbuffer(GL_RENDERBUFFER, _renderBuffer); glBindRenderbuffer(GL_RENDERBUFFER, _renderBuffer);
[_eaglContext renderbufferStorage:GL_RENDERBUFFER fromDrawable:(CAEAGLLayer *)self.layer]; [_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); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, _renderBuffer);
if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
...@@ -657,6 +652,7 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su ...@@ -657,6 +652,7 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
- (void)layoutSubviews - (void)layoutSubviews
{ {
[self reshape];
if (_zeroCopy) { if (_zeroCopy) {
/* we don't have a clean event for 0-copy, so destory and re-create right here */ /* we don't have a clean event for 0-copy, so destory and re-create right here */
[self destroyBuffers]; [self destroyBuffers];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment