<html><head></head><body>The code is already quite confusing without the patch. It does not make much sense to fail locking the GL, unless there is a bug somewhere else.<br><br><div class="gmail_quote">Le 24 octobre 2019 12:14:29 GMT+03:00, Marvin Scholz <epirat07@gmail.com> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail"><br><br>On 24 Oct 2019, at 11:10, Steve Lhomme wrote:<br><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"> Otherwise the core will call VOUT_DISPLAY_RESET_PICTURES which we <br> don't support.<br><br> This is what is done in macosx.m when vlc_gl_MakeCurrent() fails.<hr> modules/video_output/caopengllayer.m | 4 ++--<br> 1 file changed, 2 insertions(+), 2 deletions(-)<br><br> diff --git a/modules/video_output/caopengllayer.m <br> b/modules/video_output/caopengllayer.m<br> index 3b542d1e637..249f7b96d5d 100644<br> --- a/modules/video_output/caopengllayer.m<br> +++ b/modules/video_output/caopengllayer.m<br> @@ -343,8 +343,8 @@ static int Control (vout_display_t *vd, int query, <br> va_list ap)<br><br> vout_display_place_t place;<br> vout_display_PlacePicture(&place, &vd->source, &cfg_tmp);<br> - if (OpenglLock(sys->gl))<br> - return VLC_EGENERIC;<br> + if (unlikely(OpenglLock(sys->gl)))<br> + return VLC_SUCCESS;<br></blockquote><br>Can you add a comment here explaining that? Else the code looks quite<br>confusing here without context.<br><br>><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"> vout_display_opengl_SetWindowAspectRatio(sys->vgl, <br> (float)place.width / place.height);<br> OpenglUnlock(sys->gl);<br> -- <br> 2.17.1<hr> vlc-devel mailing list<br> To unsubscribe or modify your subscription options:<br> <a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a><br></blockquote><hr>vlc-devel mailing list<br>To unsubscribe or modify your subscription options:<br><a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a></pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>