Details

Reviewers: None
Maniphest Tasks: T67530: [WIP] DesignTask: Add Drawing Of Image/UV Editor to the Draw Manager

Summary

This patch is a prototype to detect how much work it is to migrate the drawing of the image/uv editor toward the DrawManager. It has been done for preparation of a architectural design discussion that will happen around bconf.

Nothing works, even nothing is actually drawn visible to the screen
Enabling Debug value 22 will show the DrawManager profiler indicating that the draw manager actually is doing the drawing.

This prototype will lead to more GPU powered editing features, that will reduce the round trips between GPU/CPU. What will for the user mean better performance.

Next steps:

When rendering Large images these images should be drawn using multiple GPU textures.
Shadow of modifier meshes

Diff Detail

Repository

rB Blender

Branch

T67530 (branched from master)

Build Status

Buildable 5752
Build 5752: arc lint + arc unit

Event Timeline

Jeroen Bakker (jbakker) created this revision.Oct 18 2019, 4:48 PM

Harbormaster completed remote builds in B5412: Diff 19108.Oct 18 2019, 4:48 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Oct 18 2019, 4:53 PM

Jeroen Bakker (jbakker) added projects: GPU / Viewport, Performance.

Basic Image Drawing

color management
repeating image drawing

Harbormaster completed remote builds in B5439: Diff 19159.Oct 22 2019, 4:59 PM

UV overlay + UV stretching overlay

Need to discuss a better solution for the linewidths. Current uv overlay uses mutliple line widths, but draw manager currently supports a fix width

Harbormaster completed remote builds in B5447: Diff 19175.Oct 23 2019, 3:41 PM

just noting that if you run into problems with UV Local View here, this is also reported for master, see T70430

Added shadow overlay

Harbormaster completed remote builds in B5448: Diff 19176.Oct 23 2019, 4:27 PM

Removed solved todo

Harbormaster completed remote builds in B5449: Diff 19177.Oct 23 2019, 4:28 PM

Alpha checkerboard
Depth Float textures

Harbormaster completed remote builds in B5497: Diff 19281.Oct 30 2019, 4:54 PM

use a full screen shader for drawing the UV/Image editor

Harbormaster completed remote builds in B5510: Diff 19304.Oct 31 2019, 3:12 PM

Added multi sample rendering for the lines

Harbormaster completed remote builds in B5523: Diff 19325.Nov 1 2019, 4:47 PM

Use experimental tab for activating the draw manager

Harbormaster completed remote builds in B5693: Diff 19649.Fri, Nov 15, 8:56 AM

Smooth drawing

Harbormaster completed remote builds in B5697: Diff 19657.Fri, Nov 15, 2:54 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Fri, Nov 15, 3:02 PM

Refactored draw manager line width. Still not the final solution. Want to reduce the number of bitflags we currently use.

Harbormaster completed remote builds in B5743: Diff 19772.Fri, Nov 22, 11:43 AM

Added the GIZMO 2d back

Harbormaster completed remote builds in B5749: Diff 19781.Fri, Nov 22, 3:38 PM

Quick implementation of the 2d cursor

Harbormaster completed remote builds in B5752: Diff 19785.Fri, Nov 22, 4:34 PM

		Path
M		release/scripts/startup/bl_ui/space_userpref.py (17 lines)
M		source/blender/draw/CMakeLists.txt (5 lines)
M		source/blender/draw/DRW_engine.h (4 lines)
P		source/blender/draw/editors/image_uv_editor.h (17 lines) Copied from source/blender/draw/intern/draw_view.h
A	M	source/blender/draw/editors/image_uv_editor.c (976 lines)
A	M	source/blender/draw/editors/shaders/image_uv_editor_region_frag.glsl (112 lines)
A	M	source/blender/draw/editors/shaders/image_uv_editor_region_vert.glsl (12 lines)
M		source/blender/draw/intern/DRW_render.h (12 lines)
M		source/blender/draw/intern/draw_manager.c (237 lines)
M		source/blender/draw/intern/draw_manager_data.c (3 lines)
M		source/blender/draw/intern/draw_manager_exec.c (25 lines)
P		source/blender/draw/intern/draw_view.h (1 line) Copied to source/blender/draw/editors/image_uv_editor.h
M		source/blender/draw/intern/draw_view.c (64 lines)
M		source/blender/draw/modes/edit_armature_mode.c (3 lines)
M		source/blender/draw/modes/object_mode.c (1 line)
M		source/blender/draw/modes/pose_mode.c (3 lines)
M		source/blender/editors/space_image/CMakeLists.txt (1 line)
M		source/blender/editors/space_image/image_draw.c (2 lines)
M		source/blender/editors/space_image/space_image.c (19 lines)
M		source/blender/editors/uvedit/uvedit_draw.c (5 lines)
M		source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl (2 lines)
M		source/blender/makesdna/DNA_userdef_types.h (1 line)
M		source/blender/makesrna/intern/rna_userdef.c (7 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	19108	959b40c		Oct 18 2019, 4:48 PM	★	★
Diff 2	19159	2c6e95b	Basic Image Drawing	Oct 22 2019, 4:59 PM	★	★
Diff 3	19175	976a2ce	UV overlay + UV stretching overlay	Oct 23 2019, 3:41 PM	★	★
Diff 4	19176	976a2ce	Added shadow overlay	Oct 23 2019, 4:27 PM	★	★
Diff 5	19177	976a2ce	Removed solved todo	Oct 23 2019, 4:28 PM	★	★
Diff 6	19281	3e7af19	* Alpha checkerboard	Oct 30 2019, 4:54 PM	★	★
Diff 7	19304	3e7af19	* use a full screen shader for drawing the UV/Image editor	Oct 31 2019, 3:12 PM	★	★
Diff 8	19325	f5b09ae	Added multi sample rendering for the lines	Nov 1 2019, 4:47 PM	★	★
Diff 9	19649	b6973ed	Use experimental tab for activating the draw manager	Fri, Nov 15, 8:56 AM	★	★
Diff 10	19657	b6973ed	Smooth drawing	Fri, Nov 15, 2:54 PM	★	★
Diff 11	19772	3d015c7	Refactored draw manager line width. Still not the final solution. Want to…	Fri, Nov 22, 11:43 AM	★	★
Diff 12	19781	2a38b85	Added the GIZMO 2d back	Fri, Nov 22, 3:38 PM	★	★
Diff 13	19785	2a38b85	Quick implementation of the 2d cursor	Fri, Nov 22, 4:33 PM	★	★

[WIP] DrawManager: Image/UV editor Drawing
Needs ReviewPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 19785

release/scripts/startup/bl_ui/space_userpref.py

source/blender/draw/CMakeLists.txt

source/blender/draw/DRW_engine.h

source/blender/draw/editors/image_uv_editor.h

source/blender/draw/editors/image_uv_editor.c

source/blender/draw/editors/shaders/image_uv_editor_region_frag.glsl

source/blender/draw/editors/shaders/image_uv_editor_region_vert.glsl

source/blender/draw/intern/DRW_render.h

source/blender/draw/intern/draw_manager.c

source/blender/draw/intern/draw_manager_data.c

source/blender/draw/intern/draw_manager_exec.c

source/blender/draw/intern/draw_view.h

source/blender/draw/intern/draw_view.c

source/blender/draw/modes/edit_armature_mode.c

source/blender/draw/modes/object_mode.c

source/blender/draw/modes/pose_mode.c

source/blender/editors/space_image/CMakeLists.txt

source/blender/editors/space_image/image_draw.c

source/blender/editors/space_image/space_image.c

source/blender/editors/uvedit/uvedit_draw.c

source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl

source/blender/makesdna/DNA_userdef_types.h

source/blender/makesrna/intern/rna_userdef.c

[WIP] DrawManager: Image/UV editor DrawingNeeds ReviewPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 19785

release/scripts/startup/bl_ui/space_userpref.py

source/blender/draw/CMakeLists.txt

source/blender/draw/DRW_engine.h

source/blender/draw/editors/image_uv_editor.h

source/blender/draw/editors/image_uv_editor.c

source/blender/draw/editors/shaders/image_uv_editor_region_frag.glsl

source/blender/draw/editors/shaders/image_uv_editor_region_vert.glsl

source/blender/draw/intern/DRW_render.h

source/blender/draw/intern/draw_manager.c

source/blender/draw/intern/draw_manager_data.c

source/blender/draw/intern/draw_manager_exec.c

source/blender/draw/intern/draw_view.h

source/blender/draw/intern/draw_view.c

source/blender/draw/modes/edit_armature_mode.c

source/blender/draw/modes/object_mode.c

source/blender/draw/modes/pose_mode.c

source/blender/editors/space_image/CMakeLists.txt

source/blender/editors/space_image/image_draw.c

source/blender/editors/space_image/space_image.c

source/blender/editors/uvedit/uvedit_draw.c

source/blender/gpu/shaders/gpu_shader_2D_edituvs_facedots_vert.glsl

source/blender/makesdna/DNA_userdef_types.h

source/blender/makesrna/intern/rna_userdef.c

[WIP] DrawManager: Image/UV editor Drawing
Needs ReviewPublic
Actions

Revision Contents
Changeset List