Differential D19155

Add HDR painting mode to Krita
ClosedPublic
Actions

Authored by dkazakov on Feb 19 2019, 1:44 PM.

Details

Reviewers

rempt

Group Reviewers

Krita

Summary

This revision is an essence of this branch: https://phabricator.kde.org/source/krita/history/kazakov%252Fhdr-support/

It enables HDR painting workflow in Krita:

Window surface format can be selected in Preferences->Display
Rec 2020 PQ color space is added to LCMS engine
Small Color Selector support selection of HDR color. You image should be in a floating point format to enable "Brightness" slider.
Allows saving HDR PNG images according to the standard

Test Plan

Build Krita with the patched Qt (in ext_qt)
Enable HDR mode in your display (if applicable)
Go to Preferences->Display and select p2020-pq surface format
Restart Krita
Create a 16-bit float image
Open Small Color Selector
Try to play with "Brightness" slider and see how the selector changes.
Download a special OCIO config: https://github.com/dimula73/krita-hdr-ocio
Enable output via OCIO and play with Exposure slider

Diff Detail

Repository

R37 Krita

Lint

Lint Skipped

Unit

Unit Tests Skipped

dkazakov requested review of this revision.Feb 19 2019, 1:44 PM

dkazakov created this revision.

The original patch was reversed. This is the correct one.

bb2a943350 Fix crash when the small color selector has zero size
4f47eca44e Cleanup some forgotten lines
05d5915a5a Remove pure virtual from KisColorSelectorComponent::setColor()
98f0a51d62 Add GPL2+ license to new files
4181901f1c PNG converter doesn't need half.h anymore
0347350087 Enable HDR mode in the autobuild script

rempt accepted this revision.Feb 21 2019, 11:56 AM

This revision is now accepted and ready to land.Feb 21 2019, 11:56 AM

Lets close this :)

Large Diff

This large diff affects 115 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

			Path
V			3rdparty/ext_qt/{0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch → 0002-Don-t-request-the-MIME-image-every-time-Windows-asks.patch}
V			3rdparty/ext_qt/{0001-disable-wintab.patch ← disable-wintab.diff} (56 lines)
V			3rdparty/ext_qt/{0002-Don-t-request-the-MIME-image-every-time-Windows-asks.patch ← 0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch} (18 lines)
V			3rdparty/ext_qt/{0002-Hack-always-return-we-support-DIBV5.patch → 0003-Hack-always-return-we-support-DIBV5.patch}
V			3rdparty/ext_qt/{0003-Hack-always-return-we-support-DIBV5.patch ← 0002-Hack-always-return-we-support-DIBV5.patch} (18 lines)
D	M		3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch (26 lines)
A	M		3rdparty/ext_qt/0004-Fix-debug-on-openGL-ES.patch (26 lines)
A	M		3rdparty/ext_qt/0005-cumulative-patch-for-hdr.patch (4574 lines)
M			3rdparty/ext_qt/CMakeLists.txt (24 lines)
D	M		3rdparty/ext_qt/QTBUG-57299.diff (111 lines)
V			3rdparty/ext_qt/{disable-wintab.diff → 0001-disable-wintab.patch}
D	M		3rdparty/ext_qt/gerrit-189539-ANGLE-mingw-fix.patch (145 lines)
D	M		3rdparty/ext_qt/gerrit-212811_qtbase-angle-d3d11-warp-crash-fix.patch (50 lines)
D	M		3rdparty/ext_qt/qopengldebug-gles.patch (13 lines)
D	M		3rdparty/ext_qt/qtgui-private-headers.diff (12 lines)
M			CMakeLists.txt (4 lines)
M			build-tools/windows/build.cmd (4 lines)
A	M		config-hdr.h.cmake (4 lines)
M			krita/data/profiles/CMakeLists.txt (1 line)
A	M	(bin)	krita/data/profiles/ITUR_2100_PQ_FULL.ICC
M			krita/data/profiles/elles-icc-profiles/CMakeLists.txt (2 lines)
M			krita/main.cc (23 lines)
M			libs/image/brushengine/kis_callback_based_paintop_property.h (21 lines)
A	M		libs/image/brushengine/kis_callback_based_paintop_property_impl.h (79 lines)
M			libs/image/brushengine/kis_combo_based_paintop_property.h (2 lines)
M			libs/image/brushengine/kis_combo_based_paintop_property.cpp (1 line)
M			libs/image/brushengine/kis_slider_based_paintop_property.h (96 lines)
M			libs/image/brushengine/kis_slider_based_paintop_property.cpp (115 lines)
M			libs/image/brushengine/kis_uniform_paintop_property.cpp (1 line)
M			libs/image/kis_fixed_paint_device.h (6 lines)
M			libs/image/kis_fixed_paint_device.cpp (15 lines)
M			libs/pigment/KoColorConversionSystem.cpp (10 lines)
M			libs/pigment/KoColorConversionTransformation.h (10 lines)
M			libs/pigment/KoColorConversionTransformation.cpp (11 lines)
M			libs/pigment/KoColorSpaceAbstract.h (3 lines)
M			libs/pigment/KoColorSpaceEngine.h (5 lines)
M			libs/pigment/KoColorSpaceEngine.cpp (9 lines)
M			libs/pigment/KoColorSpaceRegistry.h (23 lines)
M			libs/pigment/KoColorSpaceRegistry.cpp (20 lines)
M			libs/ui/CMakeLists.txt (4 lines)
A	M		libs/ui/KisOcioConfiguration.h (43 lines)
A	M		libs/ui/KisOcioConfiguration.cpp (20 lines)
M			libs/ui/brushhud/kis_uniform_paintop_property_widget.h (4 lines)
M			libs/ui/canvas/kis_abstract_canvas_widget.h (6 lines)
M			libs/ui/canvas/kis_canvas2.h (6 lines)
M			libs/ui/canvas/kis_canvas2.cpp (53 lines)
M			libs/ui/canvas/kis_canvas_widget_base.h (4 lines)
M			libs/ui/canvas/kis_display_color_converter.h (17 lines)
M			libs/ui/canvas/kis_display_color_converter.cpp (317 lines)
M			libs/ui/canvas/kis_qpainter_canvas.h (3 lines)
M			libs/ui/canvas/kis_qpainter_canvas.cpp (9 lines)
M			libs/ui/canvas/kis_update_info.h (2 lines)
M			libs/ui/dialogs/kis_dlg_preferences.h (1 line)
M			libs/ui/dialogs/kis_dlg_preferences.cc (183 lines)
M			libs/ui/forms/wdgdisplaysettings.ui (177 lines)
M			libs/ui/kis_config.h (22 lines)
M			libs/ui/kis_config.cc (86 lines)
M			libs/ui/kis_png_converter.h (2 lines)
M			libs/ui/kis_png_converter.cpp (127 lines)
A	M		libs/ui/opengl/KisOpenGLModeProber.h (145 lines)
A	M		libs/ui/opengl/KisOpenGLModeProber.cpp (253 lines)
A	M		libs/ui/opengl/KisScreenInformationAdapter.h (66 lines)
A	M		libs/ui/opengl/KisScreenInformationAdapter.cpp (306 lines)
M			libs/ui/opengl/kis_opengl.h (25 lines)
M			libs/ui/opengl/kis_opengl.cpp (622 lines)
M			libs/ui/opengl/kis_opengl_canvas2.h (4 lines)
M			libs/ui/opengl/kis_opengl_canvas2.cpp (36 lines)
M			libs/ui/opengl/kis_opengl_image_textures.h (15 lines)
M			libs/ui/opengl/kis_opengl_image_textures.cpp (114 lines)
M			libs/ui/opengl/kis_opengl_p.h (1 line)
M			libs/ui/opengl/kis_opengl_shader_loader.cpp (4 lines)
D	M		libs/ui/opengl/kis_opengl_win.cpp (343 lines)
M			libs/ui/tests/kis_derived_resources_test.cpp (2 lines)
M			plugins/color/lcms2engine/IccColorSpaceEngine.h (2 lines)
M			plugins/color/lcms2engine/IccColorSpaceEngine.cpp (6 lines)
M			plugins/color/lcms2engine/LcmsEnginePlugin.cpp (10 lines)
A	M		plugins/color/lcms2engine/LcmsRGBP2020PQColorSpace.h (127 lines)
A	M		plugins/color/lcms2engine/LcmsRGBP2020PQColorSpaceTransformation.h (269 lines)
M			plugins/color/lcms2engine/tests/CMakeLists.txt (1 line)
A	M		plugins/color/lcms2engine/tests/TestLcmsRGBP2020PQColorSpace.h (32 lines)
A	M		plugins/color/lcms2engine/tests/TestLcmsRGBP2020PQColorSpace.cpp (185 lines)
M			plugins/dockers/CMakeLists.txt (4 lines)
M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp (4 lines)
M			plugins/dockers/advancedcolorselector/kis_color_selector_component.h (8 lines)
M			plugins/dockers/advancedcolorselector/kis_color_selector_component.cpp (19 lines)
M			plugins/dockers/advancedcolorselector/kis_color_selector_ring.cpp (4 lines)
M			plugins/dockers/advancedcolorselector/kis_color_selector_simple.cpp (1 line)
M			plugins/dockers/advancedcolorselector/kis_color_selector_triangle.cpp (1 line)
M			plugins/dockers/advancedcolorselector/kis_color_selector_wheel.h (3 lines)
M			plugins/dockers/advancedcolorselector/kis_color_selector_wheel.cpp (28 lines)
M			plugins/dockers/lut/lutdocker_dock.cpp (110 lines)
M			plugins/dockers/lut/ocio_display_filter.cpp (7 lines)
M			plugins/dockers/lut/wdglut.ui (4 lines)
M			plugins/dockers/smallcolorselector/CMakeLists.txt (16 lines)
A	M		plugins/dockers/smallcolorselector/KisClickableGLImageWidget.h (73 lines)
A	M		plugins/dockers/smallcolorselector/KisClickableGLImageWidget.cpp (158 lines)
A	M		plugins/dockers/smallcolorselector/KisGLImageF16.h (58 lines)
A	M		plugins/dockers/smallcolorselector/KisGLImageF16.cpp (119 lines)
A	M		plugins/dockers/smallcolorselector/KisGLImageWidget.h (70 lines)
A	M		plugins/dockers/smallcolorselector/KisGLImageWidget.cpp (274 lines)
A	M		plugins/dockers/smallcolorselector/kis_gl_image_widget.frag (41 lines)
A	M		plugins/dockers/smallcolorselector/kis_gl_image_widget.qrc (6 lines)
A	M		plugins/dockers/smallcolorselector/kis_gl_image_widget.vert (35 lines)
M			plugins/dockers/smallcolorselector/kis_small_color_widget.h (53 lines)
M			plugins/dockers/smallcolorselector/kis_small_color_widget.cc (588 lines)
M			plugins/dockers/smallcolorselector/smallcolorselector_dock.h (3 lines)
M			plugins/dockers/smallcolorselector/smallcolorselector_dock.cc (31 lines)
M			plugins/extensions/pykrita/kritarunner/main.cpp (2 lines)
M			plugins/impex/png/kis_png_export.h (7 lines)
M			plugins/impex/png/kis_png_export.cc (29 lines)
M			plugins/impex/png/kis_wdg_options_png.ui (175 lines)
M			plugins/impex/png/tests/kis_png_test.h (1 line)
M			plugins/impex/png/tests/kis_png_test.cpp (115 lines)
M			plugins/tools/basictools/kis_tool_colorpicker.cc (15 lines)
M			plugins/tools/basictools/wdgcolorpicker.ui (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	52065		Feb 19 2019, 1:37 PM	★	★
Diff 2	52067		Feb 19 2019, 1:59 PM	★	★
Diff 3	52082		Feb 19 2019, 3:46 PM	★	★

Add HDR painting mode to KritaClosedPublicActions

Details

Diff Detail

Large Diff

Revision ContentsChangeset List

Diff 52082

3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch

3rdparty/ext_qt/0001-disable-wintab.patch

3rdparty/ext_qt/0002-Don-t-request-the-MIME-image-every-time-Windows-asks.patch

3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch

3rdparty/ext_qt/0003-Hack-always-return-we-support-DIBV5.patch

3rdparty/ext_qt/0003-Hack-for-fullscreen-workaround.patch

3rdparty/ext_qt/0004-Fix-debug-on-openGL-ES.patch

3rdparty/ext_qt/0005-cumulative-patch-for-hdr.patch

3rdparty/ext_qt/CMakeLists.txt

3rdparty/ext_qt/QTBUG-57299.diff

3rdparty/ext_qt/disable-wintab.diff

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

3rdparty/ext_qt/gerrit-212811_qtbase-angle-d3d11-warp-crash-fix.patch

3rdparty/ext_qt/qopengldebug-gles.patch

3rdparty/ext_qt/qtgui-private-headers.diff

CMakeLists.txt

build-tools/windows/build.cmd

config-hdr.h.cmake

krita/data/profiles/CMakeLists.txt

krita/data/profiles/ITUR_2100_PQ_FULL.ICC

krita/data/profiles/elles-icc-profiles/CMakeLists.txt

krita/main.cc

libs/image/brushengine/kis_callback_based_paintop_property.h

libs/image/brushengine/kis_callback_based_paintop_property_impl.h

libs/image/brushengine/kis_combo_based_paintop_property.h

libs/image/brushengine/kis_combo_based_paintop_property.cpp

libs/image/brushengine/kis_slider_based_paintop_property.h

libs/image/brushengine/kis_slider_based_paintop_property.cpp

libs/image/brushengine/kis_uniform_paintop_property.cpp

libs/image/kis_fixed_paint_device.h

libs/image/kis_fixed_paint_device.cpp

libs/pigment/KoColorConversionSystem.cpp

libs/pigment/KoColorConversionTransformation.h

libs/pigment/KoColorConversionTransformation.cpp

libs/pigment/KoColorSpaceAbstract.h

libs/pigment/KoColorSpaceEngine.h

libs/pigment/KoColorSpaceEngine.cpp

libs/pigment/KoColorSpaceRegistry.h

libs/pigment/KoColorSpaceRegistry.cpp

libs/ui/CMakeLists.txt

libs/ui/KisOcioConfiguration.h

libs/ui/KisOcioConfiguration.cpp

libs/ui/brushhud/kis_uniform_paintop_property_widget.h

libs/ui/canvas/kis_abstract_canvas_widget.h

libs/ui/canvas/kis_canvas2.h

libs/ui/canvas/kis_canvas2.cpp

libs/ui/canvas/kis_canvas_widget_base.h

libs/ui/canvas/kis_display_color_converter.h

libs/ui/canvas/kis_display_color_converter.cpp

libs/ui/canvas/kis_qpainter_canvas.h

libs/ui/canvas/kis_qpainter_canvas.cpp

libs/ui/canvas/kis_update_info.h

libs/ui/dialogs/kis_dlg_preferences.h

libs/ui/dialogs/kis_dlg_preferences.cc

libs/ui/forms/wdgdisplaysettings.ui

libs/ui/kis_config.h

libs/ui/kis_config.cc

libs/ui/kis_png_converter.h

libs/ui/kis_png_converter.cpp

libs/ui/opengl/KisOpenGLModeProber.h

libs/ui/opengl/KisOpenGLModeProber.cpp

libs/ui/opengl/KisScreenInformationAdapter.h

libs/ui/opengl/KisScreenInformationAdapter.cpp

libs/ui/opengl/kis_opengl.h

libs/ui/opengl/kis_opengl.cpp

libs/ui/opengl/kis_opengl_canvas2.h

libs/ui/opengl/kis_opengl_canvas2.cpp

libs/ui/opengl/kis_opengl_image_textures.h

libs/ui/opengl/kis_opengl_image_textures.cpp

libs/ui/opengl/kis_opengl_p.h

libs/ui/opengl/kis_opengl_shader_loader.cpp

libs/ui/opengl/kis_opengl_win.cpp

libs/ui/tests/kis_derived_resources_test.cpp

plugins/color/lcms2engine/IccColorSpaceEngine.h

Add HDR painting mode to Krita
ClosedPublic
Actions

Revision Contents
Changeset List