[vlc-commits] opengl: cvpx: fill opengl_tex_converter_t on success

Thomas Guillem git at videolan.org
Wed Nov 22 09:16:44 CET 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov 22 09:13:51 2017 +0100| [68ebdf180b49a56bca8364ea5aeb8e5bd69f6090] | committer: Thomas Guillem

opengl: cvpx: fill opengl_tex_converter_t on success

This fixes a black screen when shader generation fails. Only saw it happening
on IOS 8.1 simulator.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=68ebdf180b49a56bca8364ea5aeb8e5bd69f6090
---

 modules/video_output/opengl/converter_cvpx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c
index 676d9220e9..b39b081a09 100644
--- a/modules/video_output/opengl/converter_cvpx.c
+++ b/modules/video_output/opengl/converter_cvpx.c
@@ -187,7 +187,6 @@ Open(vlc_object_t *obj)
             return VLC_EGENERIC;
         }
     }
-    tc->handle_texs_gen = true;
 #else
     const GLenum tex_target = GL_TEXTURE_RECTANGLE;
     {
@@ -253,6 +252,9 @@ Open(vlc_object_t *obj)
         return VLC_EGENERIC;
     }
 
+#if TARGET_OS_IPHONE
+    tc->handle_texs_gen = true;
+#endif
     tc->priv              = priv;
     tc->pf_update         = tc_cvpx_update;
     tc->fshader           = fragment_shader;



More information about the vlc-commits mailing list