Merge branch 'alvin/T6696-opengl-angle'
0b2344049c23
Actions

Authored by alvinhochun on Sep 10 2017, 5:01 PM.

Description

Merge branch 'alvin/T6696-opengl-angle'

This adds canvas rendering with Direct3D11 via ANGLE on Windows.

ANGLE is a library which translates OpenGL ES rendering functions to
other hardware rendering APIs, including Direct3D. It is supported by
the Windows build of Qt.

This aims to improve the compatibility of the OpenGL canvas with buggy
Windows Intel drivers by allowing the use of the Direct3D11 rendering
backend of ANGLE.

Krita can still be used with a Qt build without dynamic OpenGL support,
but it will only be able to use native desktop OpenGL. To enable ANGLE,
ext_qt will need to be rebuilt.

CCMAIL: kimageshop@kde.org
CCBUG: 360601
Maniphest Tasks: T5883, T6696, T6728

Details

Committed

alvinhochun

Sep 10 2017, 5:19 PM

Parents

R37:17e0d976d915: Add Qt ANGLE notes to 3rdparty/README.md
R37:91be09796c57: CPMT: Update readme, remove files, fix unsetting language.

Branches

Unknown

Tags

Unknown

alvinhochun committed R37:0b2344049c23: Merge branch 'alvin/T6696-opengl-angle' (authored by alvinhochun).Sep 10 2017, 5:19 PM

Merged Changes

Commit	Author	Details	Committed
17e0d976d915	alvinhochun	Add Qt ANGLE notes to 3rdparty/README.md	Sep 10 2017
079e5e152e60	alvinhochun	Make ANGLE optional in ext_qt (Windows)	Sep 10 2017
a90fb13bc03d	alvinhochun	Fix build outside of Windows again	Sep 10 2017
950ef85b5204	alvinhochun	Fix build outside of Windows	Sep 10 2017
932a2515bdd6	alvinhochun	Enable ANGLE and add config options (Windows)	Sep 10 2017
1808e90e8d8d	alvinhochun	Add additional Windows OpenGL checking	Sep 10 2017
bc059b743a96	alvinhochun	Refactor OpenGL checking code	Sep 9 2017
58033f21e3ae	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Sep 8 2017
0ee46367ccdf	rempt	Fix check for opengl	Aug 24 2017
a3e07836f8b5	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 19 2017
ba26bfb3626a	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 15 2017
b761e0ec9ddf	alvinhochun	Add comment explaining OpenGLES-specific code	Aug 15 2017
81687795c1d4	alvinhochun	Add call to GL_BLEND after use	Aug 15 2017
d30563229643	alvinhochun	Merge branch 'alvin/logging-capture' into alvin/T6696-opengl-angle	Aug 15 2017
dbbbb67f02e2	alvinhochun	Change foreach to Q_FOREACH	Aug 15 2017
f89ad0a291e4	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 14 2017
8133eb460db5	alvinhochun	Force ANGLE to use D3D11	Aug 14 2017
6f0b9df326f4	alvinhochun	Add log capturing of QPA OpenGL check for diag on Windows	Aug 14 2017
56647b4fd7ea	alvinhochun	Merge branch 'alvin/logging-capture' into alvin/T6696-opengl-angle	Aug 13 2017
9ae556ff64d2	alvinhochun	Add missing license headers	Aug 13 2017
e3b45ab77508	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 13 2017
278cc34fa4fa	alvinhochun	Merge branch 'master' into alvin/logging-capture	Aug 13 2017
221f6415076c	alvinhochun	Add KisLoggingManager for capturing log messages	Aug 13 2017
fda0af0e20d4	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 11 2017
8a3f6805f427	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 10 2017
6f077eedfbfc	alvinhochun	Add texture format fallback for OpenGL ES 3	Aug 10 2017
8c2d0478be99	alvinhochun	Change texture formats used with OpenGL ES 3	Aug 9 2017
1452ed52304b	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 9 2017
7be63a5bd1f3	alvinhochun	Enable qt.qpa.gl logging on Windows	Aug 6 2017
82ef9261049b	alvinhochun	Merge branch 'master' into alvin/T6696-opengl-angle	Aug 5 2017
5a6dd91669e9	alvinhochun	Use blending to paint brush outline on OpenGL ES 3	Aug 5 2017
63ceca75e50b	alvinhochun	Call QSurfaceFormat::setDefaultFormat only once	Aug 3 2017
c8b2d7a2b61f	alvinhochun	Patch Qt for building ANGLE with mingw-w64 7.1 and Windows 10 SDK	Aug 3 2017
f7a46a46ccde	alvinhochun	Patch Qt qopengldebug.cpp to fix crash with ANGLE	Aug 2 2017
5b2cc36b35e6	alvinhochun	Use texture formats supported by OpenGL ES 3	Aug 2 2017
d7180793d8bc	alvinhochun	Disable unsupported functions on OpenGL ES 3	Aug 2 2017
a19df1a8e96e	alvinhochun	Support OpenGL ES 3 shaders	Aug 2 2017
f8585d24e13e	alvinhochun	Enable dynamic OpenGL for Windows Qt and build ANGLE	Aug 2 2017

Changes (18)

				Path	Packages
	M			3rdparty/CMakeLists.txt
	M			3rdparty/README.md
	M			3rdparty/ext_qt/CMakeLists.txt
	A			3rdparty/ext_qt/gerrit-189539-ANGLE-mingw-fix.patch
	A			3rdparty/ext_qt/qopengldebug-gles.patch
	M			krita/main.cc
	M			libs/global/CMakeLists.txt
	A			libs/global/KisLoggingManager.cpp
	A			libs/global/KisLoggingManager.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/forms/wdgdisplaysettings.ui
	M			libs/ui/kis_config.cc
	M			libs/ui/opengl/kis_opengl.cpp
	M			libs/ui/opengl/kis_opengl.h
	M			libs/ui/opengl/kis_opengl_canvas2.cpp
	M			libs/ui/opengl/kis_opengl_image_textures.cpp
	M			libs/ui/opengl/kis_opengl_shader_loader.cpp
	M			libs/ui/opengl/kis_texture_tile.cpp

Merge branch 'alvin/T6696-opengl-angle'0b2344049c23Actions

Description

Details

Merged Changes

Changes (18)

R37:0b2344049c23

3rdparty/CMakeLists.txt

3rdparty/README.md

3rdparty/ext_qt/CMakeLists.txt

3rdparty/ext_qt/gerrit-189539-ANGLE-mingw-fix.patch

3rdparty/ext_qt/qopengldebug-gles.patch

krita/main.cc

libs/global/CMakeLists.txt

libs/global/KisLoggingManager.cpp

libs/global/KisLoggingManager.h

libs/ui/dialogs/kis_dlg_preferences.cc

libs/ui/forms/wdgdisplaysettings.ui

libs/ui/kis_config.cc

libs/ui/opengl/kis_opengl.cpp

libs/ui/opengl/kis_opengl.h

libs/ui/opengl/kis_opengl_canvas2.cpp

libs/ui/opengl/kis_opengl_image_textures.cpp

libs/ui/opengl/kis_opengl_shader_loader.cpp

libs/ui/opengl/kis_texture_tile.cpp

Merge branch 'alvin/T6696-opengl-angle'
0b2344049c23
Actions