Skip to content

Commit

Permalink
It's alive
Browse files Browse the repository at this point in the history 
- Fix crash by resetting the indirect dispatch buffer each frame
- Use DSA + immutable storage for depth pyramid and visibility buffer
- In pass two, check against the thread count written out in pass one to
  early return
- Require a draw barrier after each apply dispatch
- Use a storage array for the last frame visibility buffer
  • Loading branch information
@Jozufozu
Jozufozu committed Sep 9, 2024
1 parent 4552716 commit f12aa15
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 51 deletions.
36 changes: 14 additions & 22 deletions common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/DepthPyramid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,13 @@
public class DepthPyramid {
private final GlProgram depthReduceProgram;

public final int pyramidTextureId;
public int pyramidTextureId = -1;

private int lastWidth = -1;
private int lastHeight = -1;

public DepthPyramid(GlProgram depthReduceProgram) {
this.depthReduceProgram = depthReduceProgram;

pyramidTextureId = GL32.glGenTextures();

GlStateManager._bindTexture(pyramidTextureId);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_NEAREST);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_NEAREST);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_COMPARE_MODE, GL32.GL_NONE);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_WRAP_S, GL32.GL_CLAMP_TO_EDGE);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_WRAP_T, GL32.GL_CLAMP_TO_EDGE);

}

public void generate() {
Expand All @@ -45,12 +35,9 @@ public void generate() {

int depthBufferId = mainRenderTarget.getDepthTextureId();

GlTextureUnit.T1.makeActive();
GlStateManager._bindTexture(depthBufferId);

GL46.glMemoryBarrier(GL46.GL_FRAMEBUFFER_BARRIER_BIT);

GL46.glActiveTexture(GL32.GL_TEXTURE1);
GlTextureUnit.T1.makeActive();

depthReduceProgram.bind();

Expand All @@ -73,7 +60,10 @@ public void generate() {
}

public void delete() {
GL32.glDeleteTextures(pyramidTextureId);
if (pyramidTextureId != -1) {
GL32.glDeleteTextures(pyramidTextureId);
pyramidTextureId = -1;
}
}

private void createPyramidMips(int mipLevels, int width, int height) {
Expand All @@ -84,14 +74,16 @@ private void createPyramidMips(int mipLevels, int width, int height) {
lastWidth = width;
lastHeight = height;

GL32.glBindTexture(GL32.GL_TEXTURE_2D, pyramidTextureId);
delete();

for (int i = 0; i < mipLevels; i++) {
int mipWidth = mipSize(width, i);
int mipHeight = mipSize(height, i);
pyramidTextureId = GL46.glCreateTextures(GL46.GL_TEXTURE_2D);
GL46.glTextureStorage2D(pyramidTextureId, mipLevels, GL32.GL_R32F, width, height);

GL32.glTexImage2D(GL32.GL_TEXTURE_2D, i, GL32.GL_R32F, mipWidth, mipHeight, 0, GL32.GL_RED, GL32.GL_FLOAT, 0);
}
GL46.glTextureParameteri(pyramidTextureId, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_NEAREST);
GL46.glTextureParameteri(pyramidTextureId, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_NEAREST);
GL46.glTextureParameteri(pyramidTextureId, GL32.GL_TEXTURE_COMPARE_MODE, GL32.GL_NONE);
GL46.glTextureParameteri(pyramidTextureId, GL32.GL_TEXTURE_WRAP_S, GL32.GL_CLAMP_TO_EDGE);
GL46.glTextureParameteri(pyramidTextureId, GL32.GL_TEXTURE_WRAP_T, GL32.GL_CLAMP_TO_EDGE);
}

public static int mipSize(int mip0Size, int level) {
Expand Down
4 changes: 2 additions & 2 deletions ...on/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectBuffers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void updateCounts(int instanceCount, int modelCount, int drawCount) {
MemoryUtil.memPutInt(ptr + DRAW_HANDLE_OFFSET, draw.handle());

MemoryUtil.memPutAddress(ptr + PASS_TWO_DISPATCH_SIZE_OFFSET, passTwoDispatch.capacity());
MemoryUtil.memPutAddress(ptr + PASS_TWO_INSTANCE_INDEX_SIZE_OFFSET, passTwoInstanceIndex.capacity());
MemoryUtil.memPutAddress(ptr + PASS_TWO_INSTANCE_INDEX_SIZE_OFFSET, INT_SIZE * instanceCount);
MemoryUtil.memPutAddress(ptr + PAGE_FRAME_DESCRIPTOR_SIZE_OFFSET, objectStorage.frameDescriptorBuffer.capacity());
MemoryUtil.memPutAddress(ptr + INSTANCE_SIZE_OFFSET, objectStorage.objectBuffer.capacity());
MemoryUtil.memPutAddress(ptr + DRAW_INSTANCE_INDEX_SIZE_OFFSET, INT_SIZE * instanceCount);
Expand All @@ -118,7 +118,7 @@ public void bindForCullPassOne() {
}

public void bindForCullPassTwo() {
multiBind(1, 5);
multiBind(0, 6);
GlBufferType.DISPATCH_INDIRECT_BUFFER.bind(passTwoDispatch.handle());
}

Expand Down
11 changes: 10 additions & 1 deletion ...c/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectCullingGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import java.util.List;
import java.util.Map;

import org.lwjgl.system.MemoryUtil;

import dev.engine_room.flywheel.api.instance.Instance;
import dev.engine_room.flywheel.api.instance.InstanceType;
import dev.engine_room.flywheel.api.material.Material;
Expand Down Expand Up @@ -127,7 +129,12 @@ public void upload(StagingBuffer stagingBuffer) {

uploadDraws(stagingBuffer);

needsDrawBarrier = true;
stagingBuffer.enqueueCopy(4 * Integer.BYTES, buffers.passTwoDispatch.handle(), 0, ptr -> {
MemoryUtil.memPutInt(ptr, 0);
MemoryUtil.memPutInt(ptr + 4, 1);
MemoryUtil.memPutInt(ptr + 8, 1);
MemoryUtil.memPutInt(ptr + 12, 0);
});
}

public void dispatchCull() {
Expand Down Expand Up @@ -163,6 +170,8 @@ public void dispatchApply() {

buffers.bindForApply();
glDispatchCompute(GlCompat.getComputeGroupCount(indirectDraws.size()), 1, 1);

needsDrawBarrier = true;
}

public void dispatchModelReset() {
Expand Down
38 changes: 21 additions & 17 deletions ...n/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/VisibilityBuffer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class VisibilityBuffer {
private static final int ATTACHMENT = GL30.GL_COLOR_ATTACHMENT1;

private final GlProgram readVisibilityProgram;
private final ResizableStorageBuffer lastFrameVisibility;
private final int textureId;
private final ResizableStorageArray lastFrameVisibility;
private int textureId = -1;

private int lastWidth = -1;
private int lastHeight = -1;
Expand All @@ -30,22 +30,15 @@ public class VisibilityBuffer {

public VisibilityBuffer(GlProgram readVisibilityProgram) {
this.readVisibilityProgram = readVisibilityProgram;
lastFrameVisibility = new ResizableStorageBuffer();
textureId = GL32.glGenTextures();

GlStateManager._bindTexture(textureId);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_NEAREST);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_NEAREST);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_WRAP_S, GL32.GL_CLAMP_TO_EDGE);
GlStateManager._texParameter(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_WRAP_T, GL32.GL_CLAMP_TO_EDGE);
lastFrameVisibility = new ResizableStorageArray(Integer.BYTES, 1.25f);
}

public void read(int pageCount) {
if (pageCount == 0) {
return;
}

lastFrameVisibility.ensureCapacity((long) pageCount << 2);
lastFrameVisibility.ensureCapacity(pageCount);

GL46.nglClearNamedBufferData(lastFrameVisibility.handle(), GL46.GL_R32UI, GL46.GL_RED_INTEGER, GL46.GL_UNSIGNED_INT, 0);

Expand Down Expand Up @@ -95,7 +88,15 @@ public void detach() {
}

public void delete() {
GL32.glDeleteTextures(textureId);
deleteTexture();
lastFrameVisibility.delete();
}

private void deleteTexture() {
if (textureId != -1) {
GL32.glDeleteTextures(textureId);
textureId = -1;
}
}

public void clear() {
Expand All @@ -117,11 +118,14 @@ private void setupTexture(int width, int height) {
lastWidth = width;
lastHeight = height;

GlTextureUnit.T0.makeActive();
GlStateManager._bindTexture(textureId);
deleteTexture();

textureId = GL46.glCreateTextures(GL46.GL_TEXTURE_2D);
GL46.glTextureStorage2D(textureId, 1, GL32.GL_R32UI, width, height);

// TODO: DSA texture storage?
GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_R32UI, width, height, 0, GL32.GL_RED_INTEGER, GL32.GL_UNSIGNED_INT, 0);
GlStateManager._bindTexture(0);
GL46.glTextureParameteri(textureId, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_NEAREST);
GL46.glTextureParameteri(textureId, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_NEAREST);
GL46.glTextureParameteri(textureId, GL32.GL_TEXTURE_WRAP_S, GL32.GL_CLAMP_TO_EDGE);
GL46.glTextureParameteri(textureId, GL32.GL_TEXTURE_WRAP_T, GL32.GL_CLAMP_TO_EDGE);
}
}
3 changes: 3 additions & 0 deletions common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlCompat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.lwjgl.opengl.GL31C;
import org.lwjgl.opengl.GL40;
import org.lwjgl.opengl.GL43;
import org.lwjgl.opengl.GL46;
import org.lwjgl.opengl.GLCapabilities;
import org.lwjgl.opengl.KHRShaderSubgroup;
import org.lwjgl.system.MemoryStack;
Expand Down Expand Up @@ -42,6 +43,8 @@ public final class GlCompat {
public static final boolean SUPPORTS_INSTANCING = isInstancingSupported();
public static final boolean SUPPORTS_INDIRECT = isIndirectSupported();

public static final int MAX_SHADER_STORAGE_BUFFER_BINDINGS = GL46.glGetInteger(GL46.GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS);

private GlCompat() {
}

Expand Down
6 changes: 6 additions & 0 deletions common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/dispatch.glsl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
struct _FlwLateCullDispatch {
uint x;
uint y;
uint z;
uint threadCount;
};
8 changes: 1 addition & 7 deletions common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/early_cull.glsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@
#include "flywheel:internal/uniforms/uniforms.glsl"
#include "flywheel:util/matrix.glsl"
#include "flywheel:internal/indirect/matrices.glsl"
#include "flywheel:internal/indirect/dispatch.glsl"

layout(local_size_x = 32) in;

uniform uint _flw_visibilityReadOffsetPages;

struct _FlwLateCullDispatch {
uint x;
uint y;
uint z;
uint threadCount;
};

layout(std430, binding = _FLW_PASS_TWO_DISPATCH_BUFFER_BINDING) restrict buffer PassTwoDispatchBuffer {
_FlwLateCullDispatch _flw_lateCullDispatch;
};
Expand Down
8 changes: 7 additions & 1 deletion common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/late_cull.glsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@
#include "flywheel:internal/uniforms/uniforms.glsl"
#include "flywheel:util/matrix.glsl"
#include "flywheel:internal/indirect/matrices.glsl"
#include "flywheel:internal/indirect/dispatch.glsl"

layout(local_size_x = 32) in;


layout(std430, binding = _FLW_PASS_TWO_DISPATCH_BUFFER_BINDING) restrict buffer PassTwoDispatchBuffer {
_FlwLateCullDispatch _flw_lateCullDispatch;
};

layout(std430, binding = _FLW_PASS_TWO_INSTANCE_INDEX_BUFFER_BINDING) restrict readonly buffer PassTwoIndexBuffer {
uint _flw_passTwoIndices[];
};
Expand Down Expand Up @@ -111,7 +117,7 @@ bool _flw_isVisible(uint instanceIndex, uint modelIndex) {
}

void main() {
if (gl_GlobalInvocationID.x >= _flw_passTwoIndices.length()) {
if (gl_GlobalInvocationID.x >= _flw_lateCullDispatch.threadCount) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/read_visibility.glsl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "flywheel:internal/indirect/buffer_bindings.glsl"

layout(local_size_x = 8, local_size_y = 8) in;
layout(local_size_x = 16, local_size_y = 16) in;

layout(binding = 0) uniform usampler2D visBuffer;

Expand Down

0 comments on commit f12aa15

Please sign in to comment.