Skip to content
This repository was archived by the owner on Sep 6, 2024. It is now read-only.

Perf optimization patches #45

Open
ShadowMC69 wants to merge 6 commits into
base: scratch
Choose a base branch
from
Open

Perf optimization patches #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc557ee
Add color clear skip
thr3343 Jun 16, 2024
09bda08
Use faster RenderPass transitions
thr3343 Jun 16, 2024
56b2dd2
Additional misc fixes
thr3343 Jun 16, 2024
98d4b57
Reduce Pipelines + Descriptor updates/binds with Chunk rendering
thr3343 Jun 16, 2024
cf73f90
Merge branch '1.20.x' into PerfOptimizationPatches
thr3343 Jun 16, 2024
e531eb6
Use aggregate fence waits
thr3343 Jun 16, 2024
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
37 changes: 15 additions & 22 deletions src/main/java/net/vulkanmod/render/chunk/WorldRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import org.lwjgl.opengl.GL11;
import org.lwjgl.vulkan.VkCommandBuffer;

import java.util.*;

Expand All @@ -71,8 +72,6 @@ public class WorldRenderer {
private SectionGraph sectionGraph;
private boolean graphNeedsUpdate;

private final Set<BlockEntity> globalBlockEntities = Sets.newHashSet();

private final TaskDispatcher taskDispatcher;

private double xTransparentOld;
Expand Down Expand Up @@ -246,9 +245,6 @@ public void allChanged() {
}

this.taskDispatcher.clearBatchQueue();
synchronized (this.globalBlockEntities) {
this.globalBlockEntities.clear();
}

this.sectionGrid = new SectionGrid(this.level, this.renderDistance);
this.sectionGraph = new SectionGraph(this.level, this.sectionGrid, this.taskDispatcher);
Expand Down Expand Up @@ -312,28 +308,31 @@ public void renderSectionLayer(RenderType renderType, PoseStack poseStack, doubl
VRenderSystem.applyMVP(poseStack.last().pose(), projection);
VRenderSystem.setPrimitiveTopologyGL(GL11.GL_TRIANGLES);

Renderer renderer = Renderer.getInstance();
GraphicsPipeline pipeline = PipelineManager.getTerrainShader(terrainRenderType);
renderer.bindGraphicsPipeline(pipeline);

IndexBuffer indexBuffer = Renderer.getDrawer().getQuadsIndexBuffer().getIndexBuffer();
Renderer.getDrawer().bindIndexBuffer(Renderer.getCommandBuffer(), indexBuffer);

int currentFrame = Renderer.getCurrentFrame();
Set<TerrainRenderType> allowedRenderTypes = Initializer.CONFIG.uniqueOpaqueLayer ? TerrainRenderType.COMPACT_RENDER_TYPES : TerrainRenderType.SEMI_COMPACT_RENDER_TYPES;
if (allowedRenderTypes.contains(terrainRenderType)) {
terrainRenderType.setCutoutUniform();

//Moved inside allowedRenderTypes to reduce overall pipeline count

Renderer renderer = Renderer.getInstance();
GraphicsPipeline pipeline = PipelineManager.getTerrainShader(terrainRenderType);
renderer.bindGraphicsPipeline(pipeline);

IndexBuffer indexBuffer = Renderer.getDrawer().getQuadsIndexBuffer().getIndexBuffer();
final VkCommandBuffer commandBuffer = Renderer.getCommandBuffer();
Renderer.getDrawer().bindIndexBuffer(commandBuffer, indexBuffer);

renderer.uploadAndBindUBOs(pipeline);

for (Iterator<ChunkArea> iterator = this.sectionGraph.getChunkAreaQueue().iterator(isTranslucent); iterator.hasNext(); ) {
ChunkArea chunkArea = iterator.next();
var queue = chunkArea.sectionQueue;
DrawBuffers drawBuffers = chunkArea.drawBuffers;

renderer.uploadAndBindUBOs(pipeline);
if (drawBuffers.getAreaBuffer(terrainRenderType) != null && queue.size() > 0) {

drawBuffers.bindBuffers(Renderer.getCommandBuffer(), pipeline, terrainRenderType, camX, camY, camZ);
renderer.uploadAndBindUBOs(pipeline);
drawBuffers.bindBuffers(commandBuffer, pipeline, terrainRenderType, camX, camY, camZ);

if (indirectDraw)
drawBuffers.buildDrawBatchesIndirect(indirectBuffers[currentFrame], queue, terrainRenderType);
Expand All @@ -343,17 +342,11 @@ public void renderSectionLayer(RenderType renderType, PoseStack poseStack, doubl
}
}

if (terrainRenderType == TerrainRenderType.CUTOUT || terrainRenderType == TerrainRenderType.TRIPWIRE) {
if (indirectDraw && (terrainRenderType == TerrainRenderType.CUTOUT || terrainRenderType == TerrainRenderType.TRIPWIRE)) {
indirectBuffers[currentFrame].submitUploads();
// uniformBuffers.submitUploads();
}

//Need to reset push constants in case the pipeline will still be used for rendering
if (!indirectDraw) {
VRenderSystem.setChunkOffset(0, 0, 0);
renderer.pushConstants(pipeline);
}

this.minecraft.getProfiler().pop();
renderType.clearRenderState();

Expand Down
28 changes: 6 additions & 22 deletions src/main/java/net/vulkanmod/render/vertex/TerrainRenderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,27 @@

import net.minecraft.client.renderer.RenderType;
import net.vulkanmod.interfaces.ExtendedRenderType;
import net.vulkanmod.vulkan.VRenderSystem;

import java.util.EnumSet;

public enum TerrainRenderType {
SOLID(0.0f, 262144 /*BIG_BUFFER_SIZE*/),
CUTOUT_MIPPED(0.5f, 262144 /*MEDIUM_BUFFER_SIZE*/),
CUTOUT(0.1f, 131072 /*SMALL_BUFFER_SIZE*/),
TRANSLUCENT(0.0f, 131072 /*SMALL_BUFFER_SIZE*/),
TRIPWIRE(0.1f, 131072 /*SMALL_BUFFER_SIZE*/);
SOLID(262144 /*BIG_BUFFER_SIZE*/),
CUTOUT_MIPPED(262144 /*MEDIUM_BUFFER_SIZE*/),
CUTOUT(131072 /*SMALL_BUFFER_SIZE*/),
TRANSLUCENT(131072 /*SMALL_BUFFER_SIZE*/),
TRIPWIRE(131072 /*SMALL_BUFFER_SIZE*/);

public static final TerrainRenderType[] VALUES = TerrainRenderType.values();

public static final EnumSet<TerrainRenderType> COMPACT_RENDER_TYPES = EnumSet.of(CUTOUT_MIPPED, TRANSLUCENT);
public static final EnumSet<TerrainRenderType> SEMI_COMPACT_RENDER_TYPES = EnumSet.of(CUTOUT_MIPPED, CUTOUT, TRANSLUCENT);

static {
SEMI_COMPACT_RENDER_TYPES.add(CUTOUT);
SEMI_COMPACT_RENDER_TYPES.add(CUTOUT_MIPPED);
SEMI_COMPACT_RENDER_TYPES.add(TRANSLUCENT);

COMPACT_RENDER_TYPES.add(CUTOUT_MIPPED);
COMPACT_RENDER_TYPES.add(TRANSLUCENT);
}

public final float alphaCutout;
public final int initialSize;

TerrainRenderType(float alphaCutout, int initialSize) {
this.alphaCutout = alphaCutout;
TerrainRenderType(int initialSize) {
this.initialSize = initialSize;
}

public void setCutoutUniform() {
VRenderSystem.alphaCutout = this.alphaCutout;
}

public static TerrainRenderType get(RenderType renderType) {
return ((ExtendedRenderType)renderType).getTerrainRenderType();
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/net/vulkanmod/vulkan/Renderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,11 @@ private void submitFrame() {

submitInfo.pCommandBuffers(stack.pointers(currentCmdBuffer));

vkResetFences(device, stack.longs(inFlightFences.get(currentFrame)));
vkResetFences(device, inFlightFences.get(currentFrame));

Synchronization.INSTANCE.waitFences();

if ((vkResult = vkQueueSubmit(DeviceManager.getGraphicsQueue().queue(), submitInfo, inFlightFences.get(currentFrame))) != VK_SUCCESS) {
vkResetFences(device, stack.longs(inFlightFences.get(currentFrame)));
throw new RuntimeException("Failed to submit draw command buffer: " + vkResult);
}

Expand Down
6 changes: 2 additions & 4 deletions src/main/java/net/vulkanmod/vulkan/Synchronization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class Synchronization {
private final LongBuffer fences;
private int idx = 0;

private ObjectArrayList<CommandPool.CommandBuffer> commandBuffers = new ObjectArrayList<>();
private final ObjectArrayList<CommandPool.CommandBuffer> commandBuffers = new ObjectArrayList<>();

Synchronization(int allocSize) {
this.fences = MemoryUtil.memAllocLong(allocSize);
Expand All @@ -45,9 +45,7 @@ public synchronized void waitFences() {

fences.limit(idx);

for (int i = 0; i < idx; i++) {
vkWaitForFences(device, fences.get(i), true, VUtil.UINT64_MAX);
}
vkWaitForFences(device, fences,true, VUtil.UINT64_MAX);

this.commandBuffers.forEach(CommandPool.CommandBuffer::reset);
this.commandBuffers.clear();
Expand Down
25 changes: 20 additions & 5 deletions src/main/java/net/vulkanmod/vulkan/VRenderSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;

import static org.lwjgl.opengl.GL11C.GL_DEPTH_BUFFER_BIT;

public abstract class VRenderSystem {
private static long window;

Expand All @@ -33,13 +35,13 @@ public abstract class VRenderSystem {
public static int colorMask = PipelineState.ColorMask.getColorMask(true, true, true, true);

public static boolean cull = true;

private static boolean canApplyClear = false;
public static boolean logicOp = false;
public static int logicOpFun = 0;

public static final float clearDepth = 1.0f;
public static FloatBuffer clearColor = MemoryUtil.memCallocFloat(4);

private static final float[] checkedClearColor = new float[4];
public static MappedBuffer modelViewMatrix = new MappedBuffer(16 * 4);
public static MappedBuffer projectionMatrix = new MappedBuffer(16 * 4);
public static MappedBuffer TextureMatrix = new MappedBuffer(16 * 4);
Expand Down Expand Up @@ -153,12 +155,25 @@ public static MappedBuffer getShaderFogColor() {
return shaderFogColor;
}

public static void clearColor(float f1, float f2, float f3, float f4) {
ColorUtil.setRGBA_Buffer(clearColor, f1, f2, f3, f4);
public static void clearColor(float f0, float f1, float f2, float f3) {
//set to true if different color
if(!(canApplyClear = checkClearColor(f0, f1, f2, f3))) return;
ColorUtil.setRGBA_Buffer(clearColor, f0, f1, f2, f3);
checkedClearColor[0]=f0;
checkedClearColor[1]=f1;
checkedClearColor[2]=f2;
checkedClearColor[3]=f3;
}

private static boolean checkClearColor(float f0, float f1, float f2, float f3) {
return checkedClearColor[0] !=f0 | checkedClearColor[1] !=f1 | checkedClearColor[2] !=f2 | checkedClearColor[3] != f3;
}

public static void clear(int v) {
Renderer.clearAttachments(v);
//Skip reapplying the same color over and over per clear
//Depth clears can be significantly faster than color clears
Renderer.clearAttachments(canApplyClear ? v : GL_DEPTH_BUFFER_BIT); //Depth Only Clears needed to fix Chat + Command Elements
canApplyClear=false;
}

// Pipeline state
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/net/vulkanmod/vulkan/framebuffer/RenderPass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private void createRenderPass() {
.storeOp(colorAttachmentInfo.storeOp)
.stencilLoadOp(VK_ATTACHMENT_LOAD_OP_DONT_CARE)
.stencilStoreOp(VK_ATTACHMENT_STORE_OP_DONT_CARE)
.initialLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
.initialLayout(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR)
.finalLayout(colorAttachmentInfo.finalLayout);

VkAttachmentReference colorAttachmentRef = attachmentRefs.get(0)
Expand Down Expand Up @@ -106,9 +106,10 @@ private void createRenderPass() {
.srcSubpass(VK_SUBPASS_EXTERNAL)
.dstSubpass(0)
.srcStageMask(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT)
.dstStageMask(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT)
.dstStageMask(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT)
.srcAccessMask(0)
.dstAccessMask(0);
.dstAccessMask(VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT)
.dependencyFlags(VK_DEPENDENCY_BY_REGION_BIT);

renderPassInfo.pDependencies(subpassDependencies);
}
Expand All @@ -120,7 +121,8 @@ private void createRenderPass() {
.srcStageMask(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT)
.dstStageMask(VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT)
.srcAccessMask(VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT)
.dstAccessMask(VK_ACCESS_SHADER_READ_BIT);
.dstAccessMask(VK_ACCESS_SHADER_READ_BIT)
.dependencyFlags(VK_DEPENDENCY_BY_REGION_BIT);

renderPassInfo.pDependencies(subpassDependencies);
}
Expand All @@ -139,8 +141,8 @@ private void createRenderPass() {
public void beginRenderPass(VkCommandBuffer commandBuffer, long framebufferId, MemoryStack stack) {

if (colorAttachmentInfo != null
&& framebuffer.getColorAttachment().getCurrentLayout() != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
framebuffer.getColorAttachment().transitionImageLayout(stack, commandBuffer, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
&& framebuffer.getColorAttachment().getCurrentLayout() != VK_IMAGE_LAYOUT_PRESENT_SRC_KHR)
framebuffer.getColorAttachment().transitionImageLayout(stack, commandBuffer, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
if (depthAttachmentInfo != null
&& framebuffer.getDepthAttachment().getCurrentLayout() != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL)
framebuffer.getDepthAttachment().transitionImageLayout(stack, commandBuffer, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/vulkanmod/vulkan/memory/MemoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ public static synchronized void createImage(int width, int height, int mipLevels
imageInfo.initialLayout(VK_IMAGE_LAYOUT_UNDEFINED);
imageInfo.usage(usage);
imageInfo.samples(VK_SAMPLE_COUNT_1_BIT);
// imageInfo.sharingMode(VK_SHARING_MODE_CONCURRENT);
//TODO
imageInfo.pQueueFamilyIndices(stack.ints(0,1));
imageInfo.sharingMode(VK_SHARING_MODE_EXCLUSIVE);
//Forcing Queue family to 0: which is always the Graphics Queue
imageInfo.pQueueFamilyIndices(stack.ints(0));

VmaAllocationCreateInfo allocationInfo = VmaAllocationCreateInfo.callocStack(stack);
//allocationInfo.usage(VMA_MEMORY_USAGE_CPU_ONLY);
Expand Down
17 changes: 2 additions & 15 deletions src/main/java/net/vulkanmod/vulkan/pass/DefaultMainPass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,27 @@ public static DefaultMainPass create() {
return new DefaultMainPass();
}

private RenderTarget mainTarget;
private final Framebuffer mainFramebuffer;

private RenderPass mainRenderPass;
private RenderPass auxRenderPass;

DefaultMainPass() {
this.mainTarget = Minecraft.getInstance().getMainRenderTarget();
this.mainFramebuffer = Vulkan.getSwapChain();

createRenderPasses();
}

private void createRenderPasses() {
RenderPass.Builder builder = RenderPass.builder(this.mainFramebuffer);
builder.getColorAttachmentInfo().setFinalLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
builder.getColorAttachmentInfo().setOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE);
builder.getDepthAttachmentInfo().setOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE);

builder.getColorAttachmentInfo().setFinalLayout(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
this.mainRenderPass = builder.build();

// Create an auxiliary RenderPass needed in case of main target rebinding
builder = RenderPass.builder(this.mainFramebuffer);
builder.getColorAttachmentInfo().setOps(VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_STORE);
builder.getDepthAttachmentInfo().setOps(VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_STORE);
builder.getColorAttachmentInfo().setFinalLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
builder.getColorAttachmentInfo().setFinalLayout(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);

this.auxRenderPass = builder.build();
}
Expand All @@ -57,9 +52,6 @@ private void createRenderPasses() {
public void begin(VkCommandBuffer commandBuffer, MemoryStack stack) {
SwapChain framebuffer = Vulkan.getSwapChain();

VulkanImage colorAttachment = framebuffer.getColorAttachment();
colorAttachment.transitionImageLayout(stack, commandBuffer, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);

framebuffer.beginRenderPass(commandBuffer, this.mainRenderPass, stack);

VkViewport.Buffer pViewport = framebuffer.viewport(stack);
Expand All @@ -73,11 +65,6 @@ public void begin(VkCommandBuffer commandBuffer, MemoryStack stack) {
public void end(VkCommandBuffer commandBuffer) {
Renderer.getInstance().endRenderPass(commandBuffer);

try(MemoryStack stack = MemoryStack.stackPush()) {
SwapChain framebuffer = Vulkan.getSwapChain();
framebuffer.getColorAttachment().transitionImageLayout(stack, commandBuffer, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
}

int result = vkEndCommandBuffer(commandBuffer);
if(result != VK_SUCCESS) {
throw new RuntimeException("Failed to record command buffer:" + result);
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/net/vulkanmod/vulkan/queue/CommandPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public CommandBuffer beginCommands() {
vkCreateFence(Vulkan.getVkDevice(), fenceInfo, null, pFence);

CommandBuffer commandBuffer = new CommandBuffer(new VkCommandBuffer(pCommandBuffer.get(i), Vulkan.getVkDevice()), pFence.get(0));
commandBuffer.handle = new VkCommandBuffer(pCommandBuffer.get(i), Vulkan.getVkDevice());
commandBuffers.add(commandBuffer);
availableCmdBuffers.add(commandBuffer);
}
Expand Down Expand Up @@ -120,8 +119,8 @@ public void cleanUp() {
}

public class CommandBuffer {
VkCommandBuffer handle;
long fence;
final VkCommandBuffer handle;
final long fence;
boolean submitted;
boolean recording;

Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/assets/vulkanmod/shaders/basic/terrain/terrain.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ layout(binding = 1) uniform UBO {
vec4 FogColor;
float FogStart;
float FogEnd;
float AlphaCutout;
};


Expand All @@ -23,7 +22,7 @@ layout(location = 0) out vec4 fragColor;

void main() {
vec4 color = texture(Sampler0, texCoord0) * vertexColor;
if (color.a < AlphaCutout) {
if (color.a < 0.5f) {
discard;
}
fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/assets/vulkanmod/shaders/basic/terrain/terrain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
{ "type": "fragment", "binding": 1, "fields": [
{ "name": "FogColor", "type": "float", "count": 4, "values": [ 0.0, 0.0, 0.0, 0.0 ] },
{ "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
{ "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] },
{ "name": "AlphaCutout", "type": "float", "count": 1, "values": [ 1.0 ] }
{ "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }
] }
],
"PushConstants": [
Expand Down