From b49ee81df9d285d08ef6bf834c6e14c5064b4070 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 10 Aug 2023 14:34:31 +0200 Subject: [PATCH] Disable OpenGL ANGLE backend. Currently ANGLE can work through desktop OpenGL only with enabled attribute EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE. Qt can't work with it enabled and shows vertically flipped content. --- ui/gl/gl_detection.cpp | 6 +++--- ui/gl/gl_detection.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp index e200e9c..3d2a542 100644 --- a/ui/gl/gl_detection.cpp +++ b/ui/gl/gl_detection.cpp @@ -33,7 +33,7 @@ namespace { bool ForceDisabled/* = false*/; #ifdef Q_OS_WIN -ANGLE ResolvedANGLE = ANGLE::Auto; +ANGLE ResolvedANGLE/* = ANGLE::Auto*/; #endif // Q_OS_WIN base::options::toggle AllowLinuxNvidiaOpenGL({ @@ -247,7 +247,7 @@ void ConfigureANGLE() { qputenv("DESKTOP_APP_QT_ANGLE_PLATFORM", backend); } }; - check("gl", ANGLE::OpenGL); + //check("gl", ANGLE::OpenGL); check("d3d9", ANGLE::D3D9); check("d3d11", ANGLE::D3D11); check("d3d11on12", ANGLE::D3D11on12); @@ -272,7 +272,7 @@ void ChangeANGLE(ANGLE backend) { case ANGLE::D3D9: write("d3d9"); break; case ANGLE::D3D11: write("d3d11"); break; case ANGLE::D3D11on12: write("d3d11on12"); break; - case ANGLE::OpenGL: write("gl"); break; + //case ANGLE::OpenGL: write("gl"); break; default: Unexpected("ANGLE backend value."); } } diff --git a/ui/gl/gl_detection.h b/ui/gl/gl_detection.h index 862be90..8ea77be 100644 --- a/ui/gl/gl_detection.h +++ b/ui/gl/gl_detection.h @@ -38,7 +38,7 @@ enum class ANGLE { D3D9, D3D11, D3D11on12, - OpenGL, + //OpenGL, }; void ConfigureANGLE(); // Requires Ui::Integration being set.