From 463da7e41030dec2aa4830b75cd1ae6fb2092a65 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 3 Sep 2021 21:46:12 +0300 Subject: [PATCH] Allow Ui::GL::Renderer::deinit on lost context. --- Telegram/SourceFiles/calls/calls_video_incoming.cpp | 4 ++-- .../SourceFiles/calls/group/calls_group_viewport_opengl.cpp | 2 +- .../SourceFiles/calls/group/calls_group_viewport_opengl.h | 2 +- Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp | 2 +- Telegram/SourceFiles/media/view/media_view_overlay_opengl.h | 2 +- Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp | 2 +- Telegram/SourceFiles/media/view/media_view_pip_opengl.h | 2 +- Telegram/lib_ui | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp index bfd3fe7e79..adfc17f7df 100644 --- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp +++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp @@ -51,7 +51,7 @@ public: void deinit( not_null widget, - QOpenGLFunctions &f) override; + QOpenGLFunctions *f) override; void paint( not_null widget, @@ -168,7 +168,7 @@ void Panel::Incoming::RendererGL::init( void Panel::Incoming::RendererGL::deinit( not_null widget, - QOpenGLFunctions &f) { + QOpenGLFunctions *f) { _textures.destroy(f); _imageProgram = std::nullopt; _texturedVertexShader = nullptr; diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp index 7ca3a50241..27e2bff250 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp @@ -398,7 +398,7 @@ void Viewport::RendererGL::ensureARGB32Program() { void Viewport::RendererGL::deinit( not_null widget, - QOpenGLFunctions &f) { + QOpenGLFunctions *f) { _frameBuffer = std::nullopt; _frameVertexShader = nullptr; _imageProgram = std::nullopt; diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h index bcb733647e..cd7eed353a 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h +++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h @@ -34,7 +34,7 @@ public: void deinit( not_null widget, - QOpenGLFunctions &f) override; + QOpenGLFunctions *f) override; void paint( not_null widget, diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp index db15fdf5fa..29cbe950af 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp @@ -130,7 +130,7 @@ void OverlayWidget::RendererGL::init( void OverlayWidget::RendererGL::deinit( not_null widget, - QOpenGLFunctions &f) { + QOpenGLFunctions *f) { _textures.destroy(f); _imageProgram = std::nullopt; _texturedVertexShader = nullptr; diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h index dca170f5c0..14f4b34576 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h +++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h @@ -25,7 +25,7 @@ public: void deinit( not_null widget, - QOpenGLFunctions &f) override; + QOpenGLFunctions *f) override; void paint( not_null widget, diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp index 92aa090611..d2f0006d4c 100644 --- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp +++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp @@ -225,7 +225,7 @@ void Pip::RendererGL::init( void Pip::RendererGL::deinit( not_null widget, - QOpenGLFunctions &f) { + QOpenGLFunctions *f) { _textures.destroy(f); _imageProgram = std::nullopt; _texturedVertexShader = nullptr; diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.h b/Telegram/SourceFiles/media/view/media_view_pip_opengl.h index d9d06154ab..52f4fcf638 100644 --- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.h +++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.h @@ -25,7 +25,7 @@ public: void deinit( not_null widget, - QOpenGLFunctions &f) override; + QOpenGLFunctions *f) override; void paint( not_null widget, diff --git a/Telegram/lib_ui b/Telegram/lib_ui index a8ce22fd75..29f339e26e 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit a8ce22fd75d8f53449aae6319d5503f7e8967f5e +Subproject commit 29f339e26e11af5d56c5da1d6536bee0233d5194