Details

Reviewers

Maniphest Tasks

T80748: Compositor backdrop handles alpha differently from image editor

Commits

rB278011e44d43: Fix T80748: Render Emissive Colors in Compositor Backdrop

Summary

This change will use the image engine to draw the backdrop of the compositor. With this patch the alpha blending will be done in Linear Scene Reference space and shows pure emissive colors.

Technical changes

As only the backdrop drawing is done using the draw manager there are some technical changes.

The overlay buffer is partly drawn outside the draw manager. When drawing the backdrop image the overlay buffer needs to be masked to simulate premultiplied alpha under.
The backdrop of the node editor is done in region pixel space. A DRWView is constructed with this space.
UDIM textures uses world position to generate the UV coordinates. This has been implemented more strict by the IMAGE_DRAW_FLAG_USE_WORLD_POS. When the flag isn't used the local coordinates are used to generate the UV coordinates what is image space.
The draw manager now checks the actual eSpaceType of the space data to use different code paths. In the future the movie clip editor will be added.

NOTE: The preview images in nodes are drawn in display space and cannot show pure emissive colors. As preview images are used on more locations it is best to fix this in a separate patch.

Diff Detail

Repository

rB Blender

Branch

T80748 (branched from master)

Build Status

Buildable 11185
Build 11185: arc lint + arc unit

Event Timeline

Jeroen Bakker (jbakker) requested review of this revision.Nov 4 2020, 2:05 PM

Jeroen Bakker (jbakker) created this revision.

Jeroen Bakker (jbakker) retitled this revision from Fix T80748: Render Emissive Colors in Compositor to [WIP] Fix T80748: Render Emissive Colors in Compositor.Nov 4 2020, 2:07 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)

Harbormaster completed remote builds in B11106: Diff 30714.Nov 4 2020, 2:07 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 4 2020, 2:51 PM

Mask background based on the depth and alpha channel

Harbormaster completed remote builds in B11108: Diff 30718.Nov 4 2020, 2:52 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 4 2020, 3:03 PM

Remove unneeded code, some small tests

Harbormaster completed remote builds in B11110: Diff 30720.Nov 4 2020, 3:36 PM

Commit at the end of the day.

Harbormaster completed remote builds in B11116: Diff 30730.Nov 4 2020, 4:52 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 9 2020, 8:41 AM

Setup correct view for drawing backdrop.

Harbormaster completed remote builds in B11182: Diff 30879.Nov 9 2020, 8:42 AM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 9 2020, 9:42 AM

Setup correct view for drawing backdrop.
Renamed SIMA_DRAW_FLAGS to IMAGE_DRAW_FLAGS
Activate the image engine view only when drawing.
Use world position to extract UV coordinates for UDIM textures
Cleanup: Commits should start with an uppercase
Don't rebind old framebuffer as srgb target.

Harbormaster completed remote builds in B11183: Diff 30881.Nov 9 2020, 10:01 AM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 9 2020, 10:16 AM

Do not draw callbacks and gizmos when drawing the backdrop

Harbormaster completed remote builds in B11184: Diff 30882.Nov 9 2020, 11:03 AM

Setup correct view for drawing backdrop.
Renamed SIMA_DRAW_FLAGS to IMAGE_DRAW_FLAGS
Activate the image engine view only when drawing.
Use world position to extract UV coordinates for UDIM textures
Cleanup: Commits should start with an uppercase
Don't rebind old framebuffer as srgb target.
Do not draw callbacks and gizmos when drawing the backdrop

Harbormaster completed remote builds in B11185: Diff 30883.Nov 9 2020, 11:10 AM

Jeroen Bakker (jbakker) retitled this revision from [WIP] Fix T80748: Render Emissive Colors in Compositor to Fix T80748: Render Emissive Colors in Compositor Backdrop.Nov 9 2020, 11:27 AM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)

Jeroen Bakker (jbakker) added a reviewer: Clément Foucault (fclem).

Jeroen Bakker (jbakker) added projects: EEVEE & Viewport, VFX & Video.

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 9 2020, 1:38 PM

Jeroen Bakker (jbakker) added a project: BF Blender (2.92).Nov 23 2020, 10:53 AM

For the background masking, I suggest (instead of adding another special case for blending) to use multiply blending with a solid white background color. This should occlude the alpha parts from the render nicely.

This revision now requires changes to proceed.Nov 23 2020, 3:48 PM

Replaced mask background blend mode with multiply

Harbormaster completed remote builds in B11403: Diff 31319.Nov 24 2020, 9:09 AM

Looks good to me. Just have few minor observation.

source/blender/draw/engines/overlay/shaders/background_frag.glsl
36	You could put this inside the switch statement like this case BG_MASK: fragColor = vec4(vec3(1.0 - alpha), 0.0); return;
source/blender/editors/space_node/drawnode.c
3560	Make a comment to indicate that this is drawing the render preview.
3612	Is this needed?

This revision is now accepted and ready to land.Nov 24 2020, 1:06 PM

Minor changes before landing into master

Harbormaster completed remote builds in B11409: Diff 31328.Nov 24 2020, 1:19 PM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Nov 24 2020, 1:21 PM

Closed by commit rB278011e44d43: Fix T80748: Render Emissive Colors in Compositor Backdrop (authored by Jeroen Bakker (jbakker)). · Explain WhyNov 24 2020, 1:23 PM

This revision was automatically updated to reflect the committed changes.

Jeroen Bakker (jbakker) added a commit: rB278011e44d43: Fix T80748: Render Emissive Colors in Compositor Backdrop.

Fix T80748: Render Emissive Colors in Compositor Backdrop
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 30883

source/blender/draw/engines/image/image_engine.c

source/blender/draw/engines/image/image_private.h

source/blender/draw/engines/image/shaders/engine_image_frag.glsl

source/blender/draw/engines/image/shaders/engine_image_vert.glsl

source/blender/draw/engines/overlay/overlay_background.c

source/blender/draw/engines/overlay/overlay_engine.c

source/blender/draw/engines/overlay/overlay_grid.c

source/blender/draw/engines/overlay/overlay_private.h

source/blender/draw/engines/overlay/shaders/background_frag.glsl

source/blender/draw/intern/DRW_render.h

source/blender/draw/intern/draw_manager.c

source/blender/draw/intern/draw_manager_exec.c

source/blender/editors/space_node/CMakeLists.txt

source/blender/editors/space_node/drawnode.c

source/blender/gpu/GPU_state.h

source/blender/gpu/opengl/gl_state.cc

Fix T80748: Render Emissive Colors in Compositor BackdropClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30883

source/blender/draw/engines/image/image_engine.c

source/blender/draw/engines/image/image_private.h

source/blender/draw/engines/image/shaders/engine_image_frag.glsl

source/blender/draw/engines/image/shaders/engine_image_vert.glsl

source/blender/draw/engines/overlay/overlay_background.c

source/blender/draw/engines/overlay/overlay_engine.c

source/blender/draw/engines/overlay/overlay_grid.c

source/blender/draw/engines/overlay/overlay_private.h

source/blender/draw/engines/overlay/shaders/background_frag.glsl

source/blender/draw/intern/DRW_render.h

source/blender/draw/intern/draw_manager.c

source/blender/draw/intern/draw_manager_exec.c

source/blender/editors/space_node/CMakeLists.txt

source/blender/editors/space_node/drawnode.c

source/blender/gpu/GPU_state.h

source/blender/gpu/opengl/gl_state.cc

Fix T80748: Render Emissive Colors in Compositor Backdrop
ClosedPublic
Actions

Revision Contents
Changeset List