move remaining blaze pipeline methods to wrapper
This commit is contained in:
+2
-2
@@ -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);
|
||||
|
||||
+2
-2
@@ -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);
|
||||
|
||||
+4
-4
@@ -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);
|
||||
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -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);
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-1
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user