[vlc-commits] opengl: no direct rendering if not backed by a vlc_gl_t module

Thomas Guillem git at videolan.org
Tue Sep 26 18:36:12 CEST 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Sep 26 18:28:04 2017 +0200| [03a0437836007e7c9970e5f66420745fc563dd66] | committer: Thomas Guillem

opengl: no direct rendering if not backed by a vlc_gl_t module

When doing direct rendering (persistent), pictures are destroyed when the
vlc_gl_t is released. This is not currently possible with the hacked vlc_gl_t
on ios/macos but it's not a problem since their OpenGL versions doesn't support
PERSISTENT mapping.

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

 modules/video_output/opengl/converter_sw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/opengl/converter_sw.c b/modules/video_output/opengl/converter_sw.c
index b933d79216..8e710bba54 100644
--- a/modules/video_output/opengl/converter_sw.c
+++ b/modules/video_output/opengl/converter_sw.c
@@ -605,8 +605,8 @@ opengl_tex_converter_generic_init(opengl_tex_converter_t *tc, bool allow_dr)
         const unsigned char *ogl_version = tc->vt->GetString(GL_VERSION);
         const bool glver_ok = strverscmp((const char *)ogl_version, "3.0") >= 0;
 
-        supports_map_persistent = glver_ok && has_pbo && has_bs && tc->vt->BufferStorage
-            && tc->vt->MapBufferRange && tc->vt->FlushMappedBufferRange
+        supports_map_persistent = glver_ok && has_pbo && has_bs && tc->gl->module
+            && tc->vt->BufferStorage && tc->vt->MapBufferRange && tc->vt->FlushMappedBufferRange
             && tc->vt->UnmapBuffer && tc->vt->FenceSync && tc->vt->DeleteSync
             && tc->vt->ClientWaitSync;
         if (supports_map_persistent)



More information about the vlc-commits mailing list