From 0cb3716dc77bec2614414b04ed2c15087b0d4873 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 17 May 2026 18:39:13 -0500 Subject: [PATCH] move remaining blaze pipeline methods to wrapper --- .../common/render/blaze/BlazeDebugWireframeRenderer.java | 4 ++-- .../common/render/blaze/BlazeDhGenericObjectRenderer.java | 4 ++-- .../common/render/blaze/BlazeDhTerrainRenderer.java | 8 ++++---- .../common/render/blaze/apply/BlazeDhApplyRenderer.java | 6 +++--- .../common/render/blaze/apply/BlazeDhCopyRenderer.java | 2 +- .../blaze/postProcessing/BlazeDhFarFadeRenderer.java | 4 ++-- .../render/blaze/postProcessing/BlazeDhFogRenderer.java | 4 ++-- .../render/blaze/postProcessing/BlazeDhSsaoRenderer.java | 4 ++-- .../blaze/postProcessing/BlazeVanillaFadeRenderer.java | 4 ++-- .../render/blaze/test/BlazeDhTestTriangleRenderer.java | 2 +- .../common/render/blaze/wrappers/RenderPassWrapper.java | 7 ++++++- 11 files changed, 27 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java index e57fc1c11..dbde2f379 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java @@ -317,9 +317,9 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper)) { // Bind instance data // - renderPassWrapper.renderPass.setUniform("uniformBlock", this.uniformBuffer); + renderPassWrapper.setUniform("uniformBlock", this.uniformBuffer); - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.setIndexBuffer(this.boxIndexBuffer); renderPassWrapper.setVertexBuffer(this.boxVertexBuffer); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java index ddc361042..1ac04728a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java @@ -567,10 +567,10 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer // Bind instance data // - renderPassWrapper.renderPass.setUniform("vertUniformBlock", this.vertUniformBuffer); + renderPassWrapper.setUniform("vertUniformBlock", this.vertUniformBuffer); // set pipeline - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.setIndexBuffer(container.indexGpuBuffer); renderPassWrapper.setVertexBuffer(container.vboGpuBuffer); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java index b7eff7d75..771d1686b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java @@ -307,11 +307,11 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer renderPassWrapper.bindTexture("uLightMap", lightmapTextureViewWrapper); // set pipeline - renderPassWrapper.renderPass.setPipeline(opaquePass ? this.opaquePipeline : this.transparentPipeline); + renderPassWrapper.setPipeline(opaquePass ? this.opaquePipeline : this.transparentPipeline); // shared uniforms - renderPassWrapper.renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); - renderPassWrapper.renderPass.setUniform("vertSharedUniformBlock", this.vertSharedUniformBuffer); + renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBuffer); + renderPassWrapper.setUniform("vertSharedUniformBlock", this.vertSharedUniformBuffer); @@ -335,7 +335,7 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer } } - renderPassWrapper.renderPass.setUniform("vertUniqueUniformBlock", uniformWrapper.gpuBuffer); + renderPassWrapper.setUniform("vertUniqueUniformBlock", uniformWrapper.gpuBuffer); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java index 0ddd29ffb..577949ffd 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java @@ -274,13 +274,13 @@ public class BlazeDhApplyRenderer throw new IllegalStateException("Missing uniform ["+uniformName+"], please set the uniform before rendering."); } - renderPassWrapper.renderPass.setUniform(uniformName, uniformBuffer); + renderPassWrapper.setUniform(uniformName, uniformBuffer); } - renderPassWrapper.renderPass.setUniform("baseFragUniformBlock", this.fragUniformBuffer); + renderPassWrapper.setUniform("baseFragUniformBlock", this.fragUniformBuffer); renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(4); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java index 63c9a3ee9..6fbf1fcd8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java @@ -130,7 +130,7 @@ public class BlazeDhCopyRenderer renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); // vertex buffer can only be "0" lol - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(4); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java index b2f2f5ba5..8e8976d38 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java @@ -225,10 +225,10 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper); renderPassWrapper.bindTexture("uDhColorTexture", BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper); - renderPassWrapper.renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); + renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBuffer); renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(4); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java index e7c88f9fb..a951ac533 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java @@ -361,10 +361,10 @@ public class BlazeDhFogRenderer implements IDhFogRenderer { renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper); - renderPassWrapper.renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); + renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBuffer); renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); // vertex buffer can only be "0" lol - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(/*indexCount*/ 4); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java index 360f5b2d0..63619e467 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java @@ -285,11 +285,11 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer { renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper); - renderPassWrapper.renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); + renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBuffer); renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(4); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java index 394f6a252..0ba0f8af5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java @@ -253,11 +253,11 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper); renderPassWrapper.bindTexture("uDhColorTexture", BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper); - renderPassWrapper.renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer); + renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBuffer); renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(/*indexCount*/ 4); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java index c9c9e76d7..e046e0dce 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java @@ -176,7 +176,7 @@ public class BlazeDhTestTriangleRenderer implements IDhTestTriangleRenderer this.mcDepthTextureViewWrapper)) { renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); - renderPassWrapper.renderPass.setPipeline(this.pipeline); + renderPassWrapper.setPipeline(this.pipeline); renderPassWrapper.draw(3); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java index fbe33ccfd..96d8150b4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java @@ -1,6 +1,7 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers; import com.mojang.blaze3d.buffers.GpuBuffer; +import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; @@ -28,7 +29,7 @@ public class RenderPassWrapper implements AutoCloseable private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder(); - public final RenderPass renderPass; + private final RenderPass renderPass; @@ -96,6 +97,10 @@ public class RenderPassWrapper implements AutoCloseable #endif } + public void setUniform(String uniformName, GpuBuffer uniformBuffer) { this.renderPass.setUniform(uniformName, uniformBuffer); } + + public void setPipeline(RenderPipeline pipeline) { this.renderPass.setPipeline(pipeline); } + //endregion