From 68be54288c5e01f5457cbde701bc1dae54130a9d Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 14 Jun 2021 12:16:00 +0400 Subject: [PATCH] Fix working using OpenGLES / ANGLE. --- .../SourceFiles/calls/group/calls_group_viewport_opengl.cpp | 2 +- Telegram/SourceFiles/core/launcher.cpp | 6 ++++-- Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp | 2 +- Telegram/lib_ui | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp index ac1603556..55044f935 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp @@ -197,7 +197,7 @@ float insideTexture() { vec2 fromTextureCenter = abs(v_texcoord - textureHalf); vec2 fromTextureEdge = max(fromTextureCenter, textureHalf) - textureHalf; float outsideCheck = dot(fromTextureEdge, fromTextureEdge); - return step(outsideCheck, 0); + return step(outsideCheck, 0.); } vec4 background() { diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp index c72db6627..42b98b276 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/sandbox.h" #include "base/concurrent_timer.h" -//#include +#include namespace Core { namespace { @@ -100,6 +100,9 @@ void ComputeDebugMode() { if (cDebugMode()) { Logs::SetDebugEnabled(true); } + if (Logs::DebugEnabled()) { + QLoggingCategory::setFilterRules("qt.qpa.gl.debug=true"); + } } void ComputeExternalUpdater() { @@ -527,7 +530,6 @@ void Launcher::processArguments() { int Launcher::executeApplication() { FilteredCommandLineArguments arguments(_argc, _argv); Sandbox sandbox(this, arguments.count(), arguments.values()); - //QLoggingCategory::setFilterRules("qt.qpa.gl.debug=true"); Ui::MainQueueProcessor processor; base::ConcurrentTimerEnvironment environment; return sandbox.start(); diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp index d63440d26..f027bb9f0 100644 --- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp +++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp @@ -116,7 +116,7 @@ uniform float roundRadius; )" + shadow.header + R"( float roundedCorner() { - vec2 rectHalf = roundRect.zw / 2; + vec2 rectHalf = roundRect.zw / 2.; vec2 rectCenter = roundRect.xy + rectHalf; vec2 fromRectCenter = abs(gl_FragCoord.xy - rectCenter); vec2 vectorRadius = vec2(roundRadius + 0.5, roundRadius + 0.5); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index f58fd1b92..27e9e349b 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit f58fd1b9277301d1d5a167fc0809558425ce608e +Subproject commit 27e9e349bf6c817f13f1989e12cd3df7041c0bdc