Skip to content

Commit

Permalink
geom/tess
Browse files Browse the repository at this point in the history
  • Loading branch information
@IMS212
IMS212 committed Jan 13, 2024
1 parent 4fe1d52 commit 91904b6
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 51 deletions.
122 changes: 73 additions & 49 deletions src/main/java/net/coderbot/iris/compat/dh/IrisLodRenderProgram.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import net.coderbot.iris.gl.program.ProgramImages;
import net.coderbot.iris.gl.program.ProgramSamplers;
import net.coderbot.iris.gl.program.ProgramUniforms;
import net.coderbot.iris.gl.shader.GlShader;
import net.coderbot.iris.gl.shader.ShaderType;
import net.coderbot.iris.gl.texture.TextureType;
import net.coderbot.iris.pipeline.ShaderPrinter;
import net.coderbot.iris.pipeline.newshader.FogMode;
Expand All @@ -43,16 +45,15 @@
import org.joml.Matrix3f;
import org.joml.Matrix4f;
import org.lwjgl.opengl.GL32;
import org.lwjgl.opengl.GL43C;
import org.lwjgl.system.MemoryStack;

import java.nio.FloatBuffer;
import java.util.Map;

public class IrisLodRenderProgram extends ShaderProgram
public class IrisLodRenderProgram
{
private static final IVersionConstants VERSION_CONSTANTS = SingletonInjector.INSTANCE.get(IVersionConstants.class);

public final AbstractVertexAttribute vao;
private final int id;

// Uniforms
public final int modelOffsetUniform;
Expand All @@ -77,16 +78,21 @@ public static IrisLodRenderProgram createProgram(String name, ProgramSource sour
Map<PatchShaderType, String> transformed = TransformPatcher.patchDH(
name,
source.getVertexSource().orElseThrow(RuntimeException::new),
source.getTessControlSource().orElse(null),
source.getTessEvalSource().orElse(null),
source.getGeometrySource().orElse(null),
source.getFragmentSource().orElseThrow(RuntimeException::new),
pipeline.getTextureMap());
String vertex2 = transformed.get(PatchShaderType.VERTEX);
String fragment2 = transformed.get(PatchShaderType.FRAGMENT);
Iris.logger.error("GOT A DH PROGRAM (not an error)");
String vertex = transformed.get(PatchShaderType.VERTEX);
String tessControl = transformed.get(PatchShaderType.TESS_CONTROL);
String tessEval = transformed.get(PatchShaderType.TESS_EVAL);
String geometry = transformed.get(PatchShaderType.GEOMETRY);
String fragment = transformed.get(PatchShaderType.FRAGMENT);
ShaderPrinter.printProgram(name)
.addSources(transformed)
.setName("dh_" + name)
.print();
return new IrisLodRenderProgram(name, source.getDirectives().getBlendModeOverride().orElse(null), vertex2, fragment2, uniforms, pipeline);
return new IrisLodRenderProgram(name, source.getDirectives().getBlendModeOverride().orElse(null), vertex, tessControl, tessEval, geometry, fragment, uniforms, pipeline);
}

public int tryGetUniformLocation2(CharSequence name) {
Expand All @@ -98,11 +104,53 @@ public int tryGetUniformLocation2(CharSequence name) {
// Noise Uniforms

// This will bind AbstractVertexAttribute
private IrisLodRenderProgram(String name, BlendModeOverride override, String vertex, String fragment, CustomUniforms customUniforms, NewWorldRenderingPipeline pipeline)
private IrisLodRenderProgram(String name, BlendModeOverride override, String vertex, String tessControl, String tessEval, String geometry, String fragment, CustomUniforms customUniforms, NewWorldRenderingPipeline pipeline)
{
super(() -> vertex,
() -> fragment,
"fragColor", new String[]{"vPosition", "color"});
id = GL43C.glCreateProgram();

GL32.glBindAttribLocation(this.id, 0, "vPosition");
GL32.glBindAttribLocation(this.id, 1, "color");

GlShader vert = new GlShader(ShaderType.VERTEX, name + ".vsh", vertex);
GL43C.glAttachShader(id, vert.getHandle());

GlShader tessCont = null;
if (tessControl != null) {
tessCont = new GlShader(ShaderType.TESSELATION_CONTROL, name + ".tcs", tessControl);
GL43C.glAttachShader(id, tessCont.getHandle());
}

GlShader tessE = null;
if (tessEval != null) {
tessE = new GlShader(ShaderType.TESSELATION_EVAL, name + ".tes", tessEval);
GL43C.glAttachShader(id, tessE.getHandle());
}

GlShader geom = null;
if (tessControl != null) {
geom = new GlShader(ShaderType.GEOMETRY, name + ".gsh", geometry);
GL43C.glAttachShader(id, geom.getHandle());
}

GlShader frag = new GlShader(ShaderType.FRAGMENT, name + ".fsh", fragment);
GL43C.glAttachShader(id, frag.getHandle());

GL32.glLinkProgram(this.id);
int status = GL32.glGetProgrami(this.id, 35714);
if (status != 1) {
String message = "Shader link error in Iris DH program! Details: " + GL32.glGetProgramInfoLog(this.id);
this.free();
throw new RuntimeException(message);
} else {
GL32.glUseProgram(this.id);
}

vert.destroy();
frag.destroy();

if (tessCont != null) tessCont.destroy();
if (tessE != null) tessE.destroy();
if (geom != null) geom.destroy();

blend = override;
ProgramUniforms.Builder uniformBuilder = ProgramUniforms.builder(name, id);
Expand All @@ -129,26 +177,6 @@ private IrisLodRenderProgram(String name, BlendModeOverride override, String ver

// Fog/Clip Uniforms
clipDistanceUniform = tryGetUniformLocation2("clipDistance");

// TODO: Add better use of the LODFormat thing
int vertexByteCount = LodUtil.LOD_VERTEX_FORMAT.getByteSize();
if (GLProxy.getInstance().VertexAttributeBufferBindingSupported)
vao = new VertexAttributePostGL43(); // also binds AbstractVertexAttribute
else
vao = new VertexAttributePreGL43(); // also binds AbstractVertexAttribute
vao.bind();
// Now a pos+light.
vao.setVertexAttribute(0, 0, VertexPointer.addUnsignedShortsPointer(4, false, true)); // 2+2+2+2
vao.setVertexAttribute(0, 1, VertexPointer.addUnsignedBytesPointer(4, true, false)); // +4
try
{
vao.completeAndCheck(vertexByteCount);
}
catch (RuntimeException e)
{
System.out.println(LodUtil.LOD_VERTEX_FORMAT);
throw e;
}
}

public void setUniform(int index, Matrix4f matrix) {
Expand Down Expand Up @@ -178,38 +206,26 @@ public void setUniform(int index, Matrix3f matrix) {
// Override ShaderProgram.bind()
public void bind()
{
super.bind();
GL43C.glUseProgram(id);
if (blend != null) blend.apply();
}
// Override ShaderProgram.unbind()

public void unbind()
{
super.unbind();
GL43C.glUseProgram(0);
ProgramUniforms.clearActiveUniforms();
ProgramSamplers.clearActiveSamplers();
BlendModeOverride.restore();
}

// Override ShaderProgram.free()
public void free()
{
vao.free();
super.free();
}

public void bindVertexBuffer(int vbo)
{
vao.bindBufferToAllBindingPoints(vbo);
}

public void unbindVertexBuffer()
{
vao.unbindBuffersFromAllBindingPoint();
GL43C.glDeleteProgram(id);
}

public void fillUniformData(Matrix4f projection, Matrix4f modelView, int worldYOffset, float partialTicks)
{
super.bind();
GL43C.glUseProgram(id);

Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer();
IrisRenderSystem.bindTextureToUnit(TextureType.TEXTURE_2D.getGlType(), IrisSamplers.LIGHTMAP_TEXTURE_UNIT, RenderSystem.getShaderTexture(2));
Expand Down Expand Up @@ -237,9 +253,17 @@ public void fillUniformData(Matrix4f projection, Matrix4f modelView, int worldYO
images.update();
}

private void setUniform(int index, float value) {
GL43C.glUniform1f(index, value);
}

public void setModelPos(Vec3f modelPos)
{
setUniform(modelOffsetUniform, modelPos);
}

private void setUniform(int index, Vec3f pos) {
GL43C.glUniform3f(index, pos.x, pos.y, pos.z);
}

}
4 changes: 2 additions & 2 deletions src/main/java/net/coderbot/iris/pipeline/transform/TransformPatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ public static Map<PatchShaderType, String> patchVanilla(
}

public static Map<PatchShaderType, String> patchDH(
String name, String vertex, String fragment,
String name, String vertex, String tessControl, String tessEval, String geometry, String fragment,
Object2ObjectMap<Tri<String, TextureType, TextureStage>, String> textureMap) {
return transform(name, vertex, null, null, null, fragment,
return transform(name, vertex, geometry, tessControl, tessEval, fragment,
new Parameters(Patch.DH, textureMap) {
@Override
public TextureStage getTextureStage() {
Expand Down

0 comments on commit 91904b6

Please sign in to comment.