Fix working using OpenGLES / ANGLE.

This commit is contained in:
John Preston 2021-06-14 12:16:00 +04:00
parent 10636d931f
commit 68be54288c
4 changed files with 7 additions and 5 deletions

View file

@ -197,7 +197,7 @@ float insideTexture() {
vec2 fromTextureCenter = abs(v_texcoord - textureHalf); vec2 fromTextureCenter = abs(v_texcoord - textureHalf);
vec2 fromTextureEdge = max(fromTextureCenter, textureHalf) - textureHalf; vec2 fromTextureEdge = max(fromTextureCenter, textureHalf) - textureHalf;
float outsideCheck = dot(fromTextureEdge, fromTextureEdge); float outsideCheck = dot(fromTextureEdge, fromTextureEdge);
return step(outsideCheck, 0); return step(outsideCheck, 0.);
} }
vec4 background() { vec4 background() {

View file

@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/sandbox.h" #include "core/sandbox.h"
#include "base/concurrent_timer.h" #include "base/concurrent_timer.h"
//#include <QtCore/QLoggingCategory> #include <QtCore/QLoggingCategory>
namespace Core { namespace Core {
namespace { namespace {
@ -100,6 +100,9 @@ void ComputeDebugMode() {
if (cDebugMode()) { if (cDebugMode()) {
Logs::SetDebugEnabled(true); Logs::SetDebugEnabled(true);
} }
if (Logs::DebugEnabled()) {
QLoggingCategory::setFilterRules("qt.qpa.gl.debug=true");
}
} }
void ComputeExternalUpdater() { void ComputeExternalUpdater() {
@ -527,7 +530,6 @@ void Launcher::processArguments() {
int Launcher::executeApplication() { int Launcher::executeApplication() {
FilteredCommandLineArguments arguments(_argc, _argv); FilteredCommandLineArguments arguments(_argc, _argv);
Sandbox sandbox(this, arguments.count(), arguments.values()); Sandbox sandbox(this, arguments.count(), arguments.values());
//QLoggingCategory::setFilterRules("qt.qpa.gl.debug=true");
Ui::MainQueueProcessor processor; Ui::MainQueueProcessor processor;
base::ConcurrentTimerEnvironment environment; base::ConcurrentTimerEnvironment environment;
return sandbox.start(); return sandbox.start();

View file

@ -116,7 +116,7 @@ uniform float roundRadius;
)" + shadow.header + R"( )" + shadow.header + R"(
float roundedCorner() { float roundedCorner() {
vec2 rectHalf = roundRect.zw / 2; vec2 rectHalf = roundRect.zw / 2.;
vec2 rectCenter = roundRect.xy + rectHalf; vec2 rectCenter = roundRect.xy + rectHalf;
vec2 fromRectCenter = abs(gl_FragCoord.xy - rectCenter); vec2 fromRectCenter = abs(gl_FragCoord.xy - rectCenter);
vec2 vectorRadius = vec2(roundRadius + 0.5, roundRadius + 0.5); vec2 vectorRadius = vec2(roundRadius + 0.5, roundRadius + 0.5);

@ -1 +1 @@
Subproject commit f58fd1b9277301d1d5a167fc0809558425ce608e Subproject commit 27e9e349bf6c817f13f1989e12cd3df7041c0bdc