Skip to content

split translucent draws from solids #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Evoloxi wants to merge 1 commit into
base: 1.21.1/dev
Choose a base branch
from
+33 −12
Open

split translucent draws from solids #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions ...c/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectCullingGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import dev.engine_room.flywheel.api.instance.Instance;
import dev.engine_room.flywheel.api.instance.InstanceType;
import dev.engine_room.flywheel.api.material.Material;
import dev.engine_room.flywheel.api.material.Transparency;
import dev.engine_room.flywheel.api.model.Model;
import dev.engine_room.flywheel.backend.compile.ContextShader;
import dev.engine_room.flywheel.backend.compile.IndirectPrograms;
Expand All @@ -37,7 +36,8 @@ public class IndirectCullingGroup<I extends Instance> {
private final IndirectBuffers buffers;
private final List<IndirectInstancer<I>> instancers = new ArrayList<>();
private final List<IndirectDraw> indirectDraws = new ArrayList<>();
private final List<MultiDraw> multiDraws = new ArrayList<>();
private final List<MultiDraw> solidDraws = new ArrayList<>();
private final List<MultiDraw> translucentDraws = new ArrayList<>();
private final List<MultiDraw> oitDraws = new ArrayList<>();

private final IndirectPrograms programs;
Expand Down Expand Up @@ -128,7 +128,8 @@ public boolean hasOitDraws() {
}

private void sortDraws() {
multiDraws.clear();
solidDraws.clear();
translucentDraws.clear();
oitDraws.clear();
// sort by visual type, then material
indirectDraws.sort(DRAW_COMPARATOR);
Expand All @@ -138,9 +139,17 @@ private void sortDraws() {

// if the next draw call has a different VisualType or Material, start a new MultiDraw
if (i == indirectDraws.size() - 1 || incompatibleDraws(draw1, indirectDraws.get(i + 1))) {
var dst = draw1.material()
.transparency() == Transparency.ORDER_INDEPENDENT ? oitDraws : multiDraws;
dst.add(new MultiDraw(draw1.material(), draw1.isEmbedded(), start, i + 1));

var material = draw1.material();
var t = material.transparency();

List<MultiDraw> dst = switch (t) {
case ORDER_INDEPENDENT -> oitDraws;
case OPAQUE -> solidDraws;
default -> translucentDraws;
};

dst.add(new MultiDraw(material, draw1.isEmbedded(), start, i + 1));
start = i + 1;
}
}
Expand Down Expand Up @@ -174,7 +183,15 @@ public void add(IndirectInstancer<I> instancer, InstancerKey<I> key, MeshPool me
}

public void submitSolid() {
if (multiDraws.isEmpty()) {
submit(solidDraws);
}

public void submitTranslucent() {
submit(translucentDraws);
}

private void submit(List<MultiDraw> draws) {
if (draws.isEmpty()) {
return;
}

Expand All @@ -184,7 +201,7 @@ public void submitSolid() {

GlProgram lastProgram = null;

for (var multiDraw : multiDraws) {
for (var multiDraw : draws) {
var drawProgram = programs.getIndirectProgram(instanceType, multiDraw.embedded ? ContextShader.EMBEDDED : ContextShader.DEFAULT, multiDraw.material, PipelineCompiler.OitMode.OFF);
if (drawProgram != lastProgram) {
lastProgram = drawProgram;
Expand All @@ -199,7 +216,7 @@ public void submitSolid() {
}
}

public void submitTransparent(PipelineCompiler.OitMode oit) {
public void submitOrderIndependent(PipelineCompiler.OitMode oit) {
if (oitDraws.isEmpty()) {
return;
}
Expand Down
10 changes: 7 additions & 3 deletions ...rc/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ public void render(LightStorage lightStorage, EnvironmentStorage environmentStor
group.submitSolid();
}

for (var group : cullingGroups.values()) {
group.submitTranslucent();
}

// Let's avoid invoking the oit chain if we don't have anything to do
boolean useOit = false;
for (var group : cullingGroups.values()) {
Expand All @@ -166,13 +170,13 @@ public void render(LightStorage lightStorage, EnvironmentStorage environmentStor
oitFramebuffer.depthRange();

for (var group : cullingGroups.values()) {
group.submitTransparent(PipelineCompiler.OitMode.DEPTH_RANGE);
group.submitOrderIndependent(PipelineCompiler.OitMode.DEPTH_RANGE);
}

oitFramebuffer.renderTransmittance();

for (var group : cullingGroups.values()) {
group.submitTransparent(PipelineCompiler.OitMode.GENERATE_COEFFICIENTS);
group.submitOrderIndependent(PipelineCompiler.OitMode.GENERATE_COEFFICIENTS);
}

oitFramebuffer.renderDepthFromTransmittance();
Expand All @@ -183,7 +187,7 @@ public void render(LightStorage lightStorage, EnvironmentStorage environmentStor
oitFramebuffer.accumulate();

for (var group : cullingGroups.values()) {
group.submitTransparent(PipelineCompiler.OitMode.EVALUATE);
group.submitOrderIndependent(PipelineCompiler.OitMode.EVALUATE);
}

oitFramebuffer.composite();
Expand Down