Diffusion Krita 9562ef726af5

merge multi-threading branch into my branch
9562ef726af5
Actions

Authored by scottpetrovic on Nov 2 2017, 10:17 PM.

Description

merge multi-threading branch into my branch

Details

Committed

scottpetrovic

Nov 2 2017, 10:17 PM

Parents

R37:89f7b9e2a971: Merge remote-tracking branch 'origin/kazakov/multithreaded-brushes'
R37:1b1ebc97541b: turn brush editor area icons to arrows. moved the edit icon by the brush name

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:9562ef726af5: merge multi-threading branch into my branch (authored by scottpetrovic).Nov 2 2017, 10:17 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
89f7b9e2a971	D8605	dkazakov	Merge remote-tracking branch 'origin/kazakov/multithreaded-brushes'	Nov 2 2017
42bf430932f1		dkazakov	Fix warnings	Nov 2 2017
8de3e806e581		dkazakov	Fix FuzzyStroke, Distance, Time and Fade sensors when used in multithreaded…	Nov 2 2017
06ea68a92974		woltherav	Fix preview for color smudge brush.	Nov 2 2017
9488b5b0e36d		radian	Implement different modes for sensor curves	Nov 2 2017
465432e82ae8		rempt	Fix crash in the icon cache on exit	Nov 2 2017
6f31cf3994ef		dkazakov	Add a comment about dab mirroring	Nov 2 2017
5c5280cb14ec		dkazakov	Fix a misprint	Nov 2 2017
46eb9ae70408		dkazakov	Fix live preview for the multithreaded brush	Nov 1 2017
c3a1ef807b00		dkazakov	Merge remote-tracking branch 'origin/master' into kazakov/multithreaded-brushes	Nov 1 2017
50d326b3e246		dkazakov	Add a class for checking correctness of concurrent access to image areas	Nov 1 2017
d93da94864a9		dkazakov	Fixes two "lost tiles" problems in the multithreaded brush	Nov 1 2017
d2eb0721fbc0		scottpetrovic	D8586: show brush size in preset list. Authored by neviril'	Nov 1 2017
abd126d0772d		scottpetrovic	change tabs to show first item in preferences area	Oct 31 2017
eeeedd6eb31c		dkazakov	Fix imagepipe brushes to support multithreaded mode	Oct 26 2017
493e8c27daa5		dkazakov	Implement a simple benchmark for the threaded brushes	Oct 25 2017
9671b94f9c96		dkazakov	Fix the freehand stroke test by increasing the fuzzyness	Oct 25 2017
559862899e64		dkazakov	Fix initialization of the resources manager for stroke-based tests	Oct 25 2017
7bff11b69601		dkazakov	Fix config update problem	Oct 20 2017
c11fbf6e5a2a		dkazakov	Fix KisDabRenderingQueue and its unittest after the refactoring	Oct 20 2017
73ee104ce86d	D7896	dkazakov	Fix initialization of KoColor to use QGlobalStatic	Oct 20 2017
4461dcaf7814		dkazakov	Add more comments	Oct 20 2017
dbb062fb089f		dkazakov	Refactor KisDabRenderingQueue to use shared pointers for jobs instead of copying	Oct 20 2017
02461e0852a1		dkazakov	Cache 'lastDabJob' value	Oct 19 2017
e10883e22863		dkazakov	Make dab rendering resources not to be shared among the dab jobs	Oct 19 2017
5bec6444fb31		dkazakov	Avoid extra deep-copies of dabs when mirroring is active	Oct 18 2017
2b5e8e61793e		dkazakov	Use KisRandomSource instead of std::random_device	Oct 18 2017
6f4b8aaf146c		dkazakov	Fix memory leak in KisAirbrushOption	Oct 18 2017
eaf421ab7e22		dkazakov	Fix a crash and a hangup caused by threading issues in KisUpdateJobItem	Oct 18 2017
67eea20583cc		dkazakov	Implement showing brush performance log on canvas overlay	Oct 16 2017
de6ff1a62ae7		dkazakov	Fix connection of Throttling plugin to real image cores	Oct 14 2017
b6b7ba3c477b		dkazakov	Fix Instant Preview for the threaded version of the brush	Oct 13 2017
b51d1090f6e0		dkazakov	Optimize calculation of reference FPS for the brushes	Oct 13 2017
115a4c3cf50d		dkazakov	Merge remote-tracking branch 'origin/master' into kazakov/multithreaded-brushes	Oct 13 2017
eb2e49b279a7		dkazakov	Move all the stroke speed metrics calculation into FreehandStroke	Oct 13 2017
ba953714cd83		dkazakov	Merge remote-tracking branch 'origin/master' into kazakov/multithreaded-brushes	Oct 12 2017
f1bae7acac2d		dkazakov	Don't recalculate device extent too often	Oct 11 2017
4e2cff2ad3df		dkazakov	Recycle KisFixedPaintDevice objects thoughout the lifetime of KisBrushOp	Oct 11 2017
f3f864499ed8		dkazakov	Post updates to the scheduler in bunches	Oct 11 2017
78df41469bae		dkazakov	Don't let paintop async update be entered twice	Oct 10 2017
13e2576e184e		dkazakov	Remove now unused no-fill dab generation method	Oct 10 2017
13f159e9013a		dkazakov	Fix KisFixedPaintDevice not to refill the data all the time	Oct 10 2017
28e049d17592		dkazakov	Don't pass dirty node to the dab job	Oct 9 2017
6c4109a60283		dkazakov	KisDabRenderingJob shouldn't be KisSharedRunnable anymore	Oct 9 2017
cc8852a63740		dkazakov	Use rolling mean wrapper in KisAnimationPlayer to avoid QtCreator's crashes	Oct 9 2017
ab46e6977db0		dkazakov	Fix KisFigurePaintingToolHelper to update the image after the rendering is done	Oct 9 2017
859ac4950364		dkazakov	Implement fake stroke jobs executor for usage in tests	Oct 9 2017
0f1a20d37035		dkazakov	Port KisBrushOp to use "mutated" and "uniquely concurrent" jobs	Oct 9 2017
fa8ba8220afd		dkazakov	Refactor addMutableJob() into addMutableJobs()	Oct 6 2017
35afd76f537f		dkazakov	Fix two crashes in a unittest	Oct 6 2017

Changes (235)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		libs/brush/kis_auto_brush.cpp
M		libs/brush/kis_brush.cpp
M		libs/brush/kis_brush.h
M		libs/brush/kis_brushes_pipe.h
M		libs/brush/kis_dab_shape.h
M		libs/brush/kis_gbr_brush.cpp
M		libs/brush/kis_gbr_brush.h
M		libs/brush/kis_imagepipe_brush.cpp
M		libs/brush/kis_imagepipe_brush.h
M		libs/brush/kis_text_brush.cpp
M		libs/brush/kis_text_brush.h
M		libs/brush/tests/kis_gbr_brush_test.cpp
M		libs/brush/tests/kis_gbr_brush_test.h
M		libs/brush/tests/kis_imagepipe_brush_test.cpp
M		libs/global/CMakeLists.txt
A		libs/global/KisRollingMeanAccumulatorWrapper.cpp
A		libs/global/KisRollingMeanAccumulatorWrapper.h
P		libs/global/KisSharedRunnable.cpp Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/global/KisSharedRunnable.h Copied from libs/ui/opengl/kis_opengl_canvas_debugger.h
A		libs/global/KisSharedThreadPoolAdapter.cpp
A		libs/global/KisSharedThreadPoolAdapter.h
A	(dir)	libs/global/tests/
A		libs/global/tests/CMakeLists.txt
A		libs/global/tests/KisSharedThreadPoolAdapterTest.cpp
P		libs/global/tests/KisSharedThreadPoolAdapterTest.h Copied from libs/image/kis_projection_updates_filter.cpp
M		libs/image/CMakeLists.txt
P		libs/image/KisFakeRunnableStrokeJobsExecutor.cpp Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/image/KisFakeRunnableStrokeJobsExecutor.h Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/image/KisRenderedDab.h Copied from libs/ui/opengl/kis_opengl_canvas_debugger.h
A		libs/image/KisRunnableBasedStrokeStrategy.cpp
A		libs/image/KisRunnableBasedStrokeStrategy.h
A		libs/image/KisRunnableStrokeJobData.cpp
A		libs/image/KisRunnableStrokeJobData.h
P		libs/image/KisRunnableStrokeJobsInterface.cpp Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/image/KisRunnableStrokeJobsInterface.h Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/image/KisStrokesQueueMutatedJobInterface.cpp Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/image/KisStrokesQueueMutatedJobInterface.h Copied from libs/image/kis_projection_updates_filter.cpp
P		libs/image/KisUpdaterContextSnapshotEx.h Copied from libs/image/kis_projection_updates_filter.cpp
A		libs/image/brushengine/KisPerStrokeRandomSource.cpp
P		libs/image/brushengine/KisPerStrokeRandomSource.h Copied from libs/image/brushengine/kis_stroke_random_source.h
A		libs/image/brushengine/KisStrokeSpeedMeasurer.cpp
P		libs/image/brushengine/KisStrokeSpeedMeasurer.h Copied from libs/ui/opengl/kis_opengl_canvas_debugger.h
M		libs/image/brushengine/kis_paint_information.cc
M		libs/image/brushengine/kis_paint_information.h
M		libs/image/brushengine/kis_paintop.cc
M		libs/image/brushengine/kis_paintop.h
M		libs/image/brushengine/kis_paintop_settings.cpp
M		libs/image/brushengine/kis_paintop_settings.h
A		libs/image/brushengine/kis_paintop_utils.cpp
M		libs/image/brushengine/kis_paintop_utils.h
M		libs/image/brushengine/kis_random_source.cpp
M		libs/image/brushengine/kis_stroke_random_source.cpp
P		libs/image/brushengine/kis_stroke_random_source.h Copied to libs/image/brushengine/KisPerStrokeRandomSource.h
M		libs/image/generator/kis_generator_layer.cpp
M		libs/image/generator/kis_generator_layer.h
M		libs/image/kis_brush_mask_applicators.h
M		libs/image/kis_distance_information.cpp
M		libs/image/kis_distance_information.h
M		libs/image/kis_fixed_paint_device.cpp
M		libs/image/kis_fixed_paint_device.h
M		libs/image/kis_image.cc
M		libs/image/kis_image.h
M		libs/image/kis_image_animation_interface.cpp
M		libs/image/kis_image_animation_interface.h
M		libs/image/kis_node.cpp
M		libs/image/kis_node.h
M		libs/image/kis_node_graph_listener.cpp
M		libs/image/kis_node_graph_listener.h
M		libs/image/kis_painter.cc
M		libs/image/kis_painter.h
A		libs/image/kis_painter_blt_multi_fixed.cpp
A		libs/image/kis_painter_p.h
P		libs/image/kis_projection_updates_filter.cpp Copied to multiple locations: libs/global/KisSharedRunnable.cpp libs/global/tests/KisSharedThreadPoolAdapterTest.h libs/image/KisFakeRunnableStrokeJobsExecutor.cpp libs/image/KisFakeRunnableStrokeJobsExecutor.h libs/image/KisRunnableStrokeJobsInterface.cpp libs/image/KisRunnableStrokeJobsInterface.h libs/image/KisStrokesQueueMutatedJobInterface.cpp libs/image/KisStrokesQueueMutatedJobInterface.h libs/image/KisUpdaterContextSnapshotEx.h libs/image/tests/KisPerStrokeRandomSourceTest.h libs/ui/tests/FreehandStrokeBenchmark.h plugins/paintops/defaultpaintops/brush/KisBrushOpSettings.cpp plugins/paintops/defaultpaintops/brush/KisBrushOpSettings.h plugins/paintops/defaultpaintops/brush/tests/KisDabRenderingQueueTest.h
M		libs/image/kis_projection_updates_filter.h
M		libs/image/kis_simple_update_queue.cpp
M		libs/image/kis_simple_update_queue.h
M		libs/image/kis_stroke.cpp
M		libs/image/kis_stroke.h
M		libs/image/kis_stroke_job.h
M		libs/image/kis_stroke_job_strategy.h
M		libs/image/kis_stroke_strategy.cpp
M		libs/image/kis_stroke_strategy.h
M		libs/image/kis_strokes_queue.cpp
M		libs/image/kis_strokes_queue.h
M		libs/image/kis_suspend_projection_updates_stroke_strategy.cpp
M		libs/image/kis_update_job_item.h
M		libs/image/kis_update_scheduler.cpp
M		libs/image/kis_update_scheduler.h
M		libs/image/kis_updater_context.cpp
M		libs/image/kis_updater_context.h
M		libs/image/krita_utils.cpp
M		libs/image/krita_utils.h
M		libs/image/tests/CMakeLists.txt
A		libs/image/tests/KisPerStrokeRandomSourceTest.cpp
P		libs/image/tests/KisPerStrokeRandomSourceTest.h Copied from libs/image/kis_projection_updates_filter.cpp
A	(dir)	libs/image/tests/data/kispainter_test/
A		libs/image/tests/data/kispainter_test/massive_bitblt_full_update_3.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_full_update_6.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_full_update_6_sel.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_full_update_6_varyop.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_partial_update_3.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_partial_update_6.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_partial_update_6_sel.png
A		libs/image/tests/data/kispainter_test/massive_bitblt_partial_update_6_varyop.png
M		libs/image/tests/kis_distance_information_test.cpp
M		libs/image/tests/kis_painter_test.cpp
M		libs/image/tests/kis_painter_test.h
M		libs/image/tests/kis_strokes_queue_test.cpp
M		libs/image/tests/kis_strokes_queue_test.h
M		libs/image/tests/scheduler_utils.h
M		libs/image/tiles3/kis_tiled_data_manager.cc
M		libs/libqml/plugins/kritasketchplugin/models/CompositeOpModel.cpp
M		libs/pigment/KoColor.cpp
M		libs/pigment/KoColor.h
M		libs/pigment/KoCompositeOp.cpp
M		libs/pigment/KoCompositeOp.h
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
M		libs/ui/KisViewManager.cpp
M		libs/ui/KisViewManager.h
M		libs/ui/canvas/kis_abstract_canvas_widget.h
M		libs/ui/canvas/kis_animation_player.cpp
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/canvas/kis_canvas2.h
M		libs/ui/canvas/kis_canvas_updates_compressor.cpp
M		libs/ui/canvas/kis_canvas_widget_base.cpp
M		libs/ui/canvas/kis_canvas_widget_base.h
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/forms/wdgcolorsettings.ui
M		libs/ui/forms/wdgperformancesettings.ui
M		libs/ui/input/KisQtWidgetsTweaker.cpp
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_fps_decoration.cpp
M		libs/ui/opengl/kis_opengl_canvas2.cpp
M		libs/ui/opengl/kis_opengl_canvas2.h
M		libs/ui/opengl/kis_opengl_canvas_debugger.cpp
P		libs/ui/opengl/kis_opengl_canvas_debugger.h Copied to multiple locations: libs/global/KisSharedRunnable.h libs/image/KisRenderedDab.h libs/image/brushengine/KisStrokeSpeedMeasurer.h libs/ui/tool/strokes/KisStrokeEfficiencyMeasurer.h plugins/paintops/defaultpaintops/brush/KisBrushOpResources.h
M		libs/ui/tests/CMakeLists.txt
A		libs/ui/tests/FreehandStrokeBenchmark.cpp
P		libs/ui/tests/FreehandStrokeBenchmark.h Copied from libs/image/kis_projection_updates_filter.cpp
A		libs/ui/tests/data/3_texture.png
A		libs/ui/tests/data/testing_1000px_auto_deafult.kpp
A		libs/ui/tests/data/testing_1000px_auto_gaussian.kpp
A		libs/ui/tests/data/testing_1000px_auto_soft.kpp
A		libs/ui/tests/data/testing_1000px_stamp_450_rotated.kpp
A		libs/ui/tests/data/testing_200px_colorsmudge_default.kpp
M		libs/ui/tests/freehand_stroke_test.cpp
A		libs/ui/tool/KisStrokeSpeedMonitor.cpp
A		libs/ui/tool/KisStrokeSpeedMonitor.h
M		libs/ui/tool/kis_figure_painting_tool_helper.cpp
M		libs/ui/tool/kis_resources_snapshot.cpp
M		libs/ui/tool/kis_resources_snapshot.h
M		libs/ui/tool/kis_tool_freehand_helper.cpp
M		libs/ui/tool/kis_tool_freehand_helper.h
A		libs/ui/tool/strokes/FreehandStrokeRunnableJobDataWithUpdate.h
A		libs/ui/tool/strokes/KisStrokeEfficiencyMeasurer.cpp
P		libs/ui/tool/strokes/KisStrokeEfficiencyMeasurer.h Copied from libs/ui/opengl/kis_opengl_canvas_debugger.h
M		libs/ui/tool/strokes/freehand_stroke.cpp
M		libs/ui/tool/strokes/freehand_stroke.h
M		libs/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp
M		libs/ui/tool/strokes/kis_painter_based_stroke_strategy.h
M		libs/ui/widgets/kis_preset_chooser.cpp
M		libs/ui/widgets/kis_preset_live_preview_view.cpp
M		libs/ui/widgets/kis_preset_live_preview_view.h
M		libs/ui/widgets/kis_scratch_pad.cpp
M		libs/widgetutils/KoResourcePaths.cpp
M		libs/widgetutils/KoResourcePaths.h
M		libs/widgetutils/kis_icon_utils.cpp
M		plugins/color/lcms2engine/LcmsEnginePlugin.cpp
M		plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
M		plugins/dockers/throttle/Throttle.cpp
M		plugins/dockers/throttle/Throttle.h
M		plugins/filters/edgedetection/kis_edge_detection_filter.cpp
M		plugins/paintops/defaultpaintops/CMakeLists.txt
A		plugins/paintops/defaultpaintops/brush/KisBrushOpResources.cpp
P		plugins/paintops/defaultpaintops/brush/KisBrushOpResources.h Copied from libs/ui/opengl/kis_opengl_canvas_debugger.h
P		plugins/paintops/defaultpaintops/brush/KisBrushOpSettings.cpp Copied from libs/image/kis_projection_updates_filter.cpp
P		plugins/paintops/defaultpaintops/brush/KisBrushOpSettings.h Copied from libs/image/kis_projection_updates_filter.cpp
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingExecutor.cpp
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingExecutor.h
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingJob.cpp
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingJob.h
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingQueue.cpp
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingQueue.h
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingQueueCache.cpp
A		plugins/paintops/defaultpaintops/brush/KisDabRenderingQueueCache.h
M		plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
M		plugins/paintops/defaultpaintops/brush/kis_brushop.h
M		plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
M		plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt
A		plugins/paintops/defaultpaintops/brush/tests/KisDabRenderingQueueTest.cpp
P		plugins/paintops/defaultpaintops/brush/tests/KisDabRenderingQueueTest.h Copied from libs/image/kis_projection_updates_filter.cpp
M		plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
M		plugins/paintops/deform/deform_brush.cpp
M		plugins/paintops/libpaintop/CMakeLists.txt
A		plugins/paintops/libpaintop/KisDabCacheUtils.cpp
A		plugins/paintops/libpaintop/KisDabCacheUtils.h
M		plugins/paintops/libpaintop/forms/wdgcurveoption.ui
M		plugins/paintops/libpaintop/kis_airbrush_option.cpp
M		plugins/paintops/libpaintop/kis_bidirectional_mixing_option.cpp
M		plugins/paintops/libpaintop/kis_brush_based_paintop.h
M		plugins/paintops/libpaintop/kis_curve_option.cpp
M		plugins/paintops/libpaintop/kis_curve_option.h
M		plugins/paintops/libpaintop/kis_curve_option_widget.cpp
M		plugins/paintops/libpaintop/kis_curve_option_widget.h
M		plugins/paintops/libpaintop/kis_dab_cache.cpp
M		plugins/paintops/libpaintop/kis_dab_cache.h
A		plugins/paintops/libpaintop/kis_dab_cache_base.cpp
A		plugins/paintops/libpaintop/kis_dab_cache_base.h
M		plugins/paintops/libpaintop/kis_dynamic_sensor.cc
M		plugins/paintops/libpaintop/kis_dynamic_sensor.h
M		plugins/paintops/libpaintop/kis_multi_sensors_model_p.cpp
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_distance.cc
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_distance.h
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_drawing_angle.cpp
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_drawing_angle.h
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fade.cpp
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fade.h
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fuzzy.cpp
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_fuzzy.h
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_time.cc
M		plugins/paintops/libpaintop/sensors/kis_dynamic_sensor_time.h
M		plugins/paintops/libpaintop/tests/kis_sensors_test.cpp
M		plugins/tools/basictools/strokes/move_stroke_strategy.cpp
M		plugins/tools/selectiontools/kis_tool_select_elliptical.cc
M		plugins/tools/selectiontools/kis_tool_select_outline.cc
M		plugins/tools/selectiontools/kis_tool_select_polygonal.cc
M		plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
A		sdk/tests/KisRectsCollisionsTracker.h
M		sdk/tests/stroke_testing_utils.cpp
M		sdk/tests/stroke_testing_utils.h
M		sdk/tests/testutil.h