Differential D8329

Fix T77867: Link Duplicate Object crashes during batch creation
ClosedPublic
Actions

Authored by Jeroen Bakker (jbakker) on Jul 17 2020, 10:17 AM.

Tags

Subscribers

None

Details

Reviewers

Clément Foucault (fclem)

Maniphest Tasks

T77867: Duplicate Object, then Linked Duplicate Object, then Repeat Last Tool causes crash

Commits

rB9582797d4b50: Fix T77867: Link Duplicate Object crashes during batch creation

Summary

When using link duplicated objects it could happen that one object is
calculating the GPUBuffers and the second object is marking these
buffers invalid. This introduces threading issues.

This patch fixes this by combining the surface and surface per material
batches. Most likely the surface per material batches are used and when
requested you will most likely need the surface batch for the depth
tests and overlays.

During tests it slightly improves performance as batches aren't thrown
away without using it.

After this patch we can add a quick path for meshes with one material
and two materials.

Alternative approaches that have been checked:

sync extraction per object: reduced performance to much (-15%) (D8292: [WIP] Fix T77867: Crash Link Duplicating Mesh)
post checks: reduced the threading issues, but didn't solve it.
separating preparation and execution of the extraction (D8312: Fix T77867: Link Duplicate Object crashes during batch creation)

Diff Detail

Repository

Branch

T77867c (branched from master)

Build Status

Buildable 9065
Build 9065: arc lint + arc unit

Event Timeline

Jeroen Bakker (jbakker) created this revision.Jul 17 2020, 10:17 AM

Harbormaster completed remote builds in B9065: Diff 26904.Jul 17 2020, 10:18 AM

Jeroen Bakker (jbakker) requested review of this revision.Jul 17 2020, 10:18 AM

Jeroen Bakker (jbakker) mentioned this in D8312: Fix T77867: Link Duplicate Object crashes during batch creation.Jul 17 2020, 10:20 AM

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

Jeroen Bakker (jbakker) added projects: EEVEE & Viewport, BF Blender (2.90).

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Jul 17 2020, 10:24 AM

Look much better than initial approach.

source/blender/draw/intern/draw_cache_extract_mesh.c
892	why remove this comment?

This revision is now accepted and ready to land.Jul 17 2020, 1:20 PM

Closed by commit rB9582797d4b50: Fix T77867: Link Duplicate Object crashes during batch creation (authored by Jeroen Bakker (jbakker)). · Explain WhyJul 17 2020, 1:48 PM

This revision was automatically updated to reflect the committed changes.

Jeroen Bakker (jbakker) marked an inline comment as done.

Jeroen Bakker (jbakker) added a commit: rB9582797d4b50: Fix T77867: Link Duplicate Object crashes during batch creation.

Jeroen Bakker (jbakker) added inline comments.Jul 17 2020, 1:49 PM

source/blender/draw/intern/draw_cache_extract_mesh.c
892	I didn't find it a hack anymore. Extracting sub buffers we also do for loose lines. But I will leave the comment for now.

Revision Contents
Changeset List

Path

Size

source/

blender/

draw/

intern/

draw_cache_extract.h

3 lines

draw_cache_extract_mesh.c

10 lines

draw_cache_impl_mesh.c

88 lines

Diff 26904

source/blender/draw/intern/draw_cache_extract.h

Loading...

source/blender/draw/intern/draw_cache_extract_mesh.c

Loading...

source/blender/draw/intern/draw_cache_impl_mesh.c

Loading...