3.3
5bcb3b2dbb78
Actions

Authored by alvinhochun on Sep 12 2017, 1:14 PM.

Description

Merge branch 'alvin/T6976-angle-3.3' into krita/3.3

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. ext_qt target on Windows is also
upgraded to Qt 5.9.1, and to build it with ANGLE properly one would need
to use mingw-w64 7.1 and have Windows 10 SDK installed.

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

Details

Committed

alvinhochun

Sep 12 2017, 1:14 PM

Parents

R37:17e2cf0b297e: Fix the canvas popup palette under WinInk for real
R37:ebeeb0807a93: Update Vc to 1.3.2

Branches

Unknown

Tags

Unknown

alvinhochun committed R37:5bcb3b2dbb78: Merge branch 'alvin/T6976-angle-3.3' into krita/3.3 (authored by alvinhochun).Sep 12 2017, 1:14 PM

Merged Changes

Commit	Author	Details	Committed
ebeeb0807a93	alvinhochun	Update Vc to 1.3.2	Sep 11 2017
9acd41e69e12	alvinhochun	Add SUBMAKE_JOBS CMake variable for 3rdparty	Sep 11 2017
729edabddda8	alvinhochun	Fix ext_qt build errors	Sep 11 2017
7c74566f1576	alvinhochun	Add Qt ANGLE notes to 3rdparty/README.md	Sep 10 2017
5b47072ff12b	alvinhochun	ext_qt (Windows): Fix dialog accelerator keys not working	Sep 10 2017
8d4e03874d5c	alvinhochun	Make ANGLE optional in ext_qt (Windows)	Sep 10 2017
19b5a72d1778	alvinhochun	Backport ANGLE support from 'alvin/T6696-opengl-angle'	Sep 10 2017
8a31ece53ec9	alvinhochun	Set logging default severity to avoid calling QLoggingCategory::setFilterRules	Sep 10 2017
46ea9a436a55	alvinhochun	Update Windows build steps to use mingw-w64 7.1	Sep 10 2017
da71d2435eac	alvinhochun	Add option to build Qt with debug info	Sep 10 2017
59aa57089180	alvinhochun	Update Qt to 5.9.1 for Windows	Sep 10 2017
8195e60a342b	alvinhochun	Fix kcoreaddons compile error on mingw-w64 7.1	Sep 10 2017

Changes (36)

				Path	Packages
	M			3rdparty/CMakeLists.txt
	M			3rdparty/README.md
	M			3rdparty/ext_boost/CMakeLists.txt
	M			3rdparty/ext_frameworks/CMakeLists.txt
	A			3rdparty/ext_frameworks/kcoreaddons-compile-fix.diff
	M			3rdparty/ext_qt/CMakeLists.txt
	M			3rdparty/ext_qt/disable-wintab.diff
	A			3rdparty/ext_qt/gerrit-189539-ANGLE-mingw-fix.patch
	A			3rdparty/ext_qt/gerrit-198123-dialog-shortcut-fix.patch
	A			3rdparty/ext_qt/qopengldebug-gles.patch
	M			3rdparty/ext_vc/CMakeLists.txt
	D			3rdparty/ext_vc/vc1.2_malloc_free.patch
	M			krita/main.cc
	M			libs/flake/FlakeDebug.cpp
	M			libs/global/CMakeLists.txt
	A			libs/global/KisLoggingManager.cpp
	A			libs/global/KisLoggingManager.h
	M			libs/global/kis_debug.cpp
	M			libs/koplugin/KritaPluginDebug.cpp
	M			libs/odf/OdfDebug.cpp
	M			libs/pigment/DebugPigment.cpp
	M			libs/store/StoreDebug.cpp
	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
	M			libs/vectorimage/VectorImageDebug.cpp
	M			libs/widgets/WidgetsDebug.cpp
	M			libs/widgetutils/WidgetUtilsDebug.cpp
	M			plugins/flake/textshape/kotext/TextDebug.cpp
	M			plugins/flake/textshape/textlayout/TextLayoutDebug.cpp

Merge branch 'alvin/T6976-angle-3.3' into krita/3.35bcb3b2dbb78Actions

Description

Details

Merged Changes

Changes (36)

R37:5bcb3b2dbb78

3rdparty/CMakeLists.txt

3rdparty/README.md

3rdparty/ext_boost/CMakeLists.txt

3rdparty/ext_frameworks/CMakeLists.txt

3rdparty/ext_frameworks/kcoreaddons-compile-fix.diff

3rdparty/ext_qt/CMakeLists.txt

3rdparty/ext_qt/disable-wintab.diff

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

3rdparty/ext_qt/gerrit-198123-dialog-shortcut-fix.patch

3rdparty/ext_qt/qopengldebug-gles.patch

3rdparty/ext_vc/CMakeLists.txt

3rdparty/ext_vc/vc1.2_malloc_free.patch

krita/main.cc

libs/flake/FlakeDebug.cpp

libs/global/CMakeLists.txt

libs/global/KisLoggingManager.cpp

libs/global/KisLoggingManager.h

libs/global/kis_debug.cpp

libs/koplugin/KritaPluginDebug.cpp

libs/odf/OdfDebug.cpp

libs/pigment/DebugPigment.cpp

libs/store/StoreDebug.cpp

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

libs/vectorimage/VectorImageDebug.cpp

libs/widgets/WidgetsDebug.cpp

libs/widgetutils/WidgetUtilsDebug.cpp

plugins/flake/textshape/kotext/TextDebug.cpp

plugins/flake/textshape/textlayout/TextLayoutDebug.cpp

Merge branch 'alvin/T6976-angle-3.3' into krita/3.3
5bcb3b2dbb78
Actions