VBO Manager

* Add a VBO manager
* Stop allocating display lists for the vanilla chunk renderer when sodium is enabled
* Move RenderGlobal * ModelRenderer to VBO Manager
* Stop preventing display list allocation for displayListEntities
This commit is contained in:
Jason Mitchell authored and Jason Mitchell committed 2024-01-04 19:24:00 -08:00
1 parent c58870fdeb
commit cf3cfd806f
3 files changed
+67 -34

No files matched your search

@@ -0,0 +1,43 @@
package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import java.util.ArrayList;
public class VBOManager {
// Not thread safe, only expected to be called from the main thread
private static int nextDisplayList = 0;
private static int getNextDisplayList() {
return nextDisplayList++;
}
private static ArrayList<VertexBuffer> vertexBuffers = new ArrayList<>();
/*
* Allocate a (range) of "display list IDs" that will refer to a VBO in the arraylist of vertex buffers.
*/
public static int generateDisplayLists(int range) {
if(range < 1) throw new IllegalArgumentException("Range must be at least 1!");
final int id = getNextDisplayList();
for (int i = 1; i < range; i++) {
// Reserve, but don't use, the rest in the range
getNextDisplayList();
}
// Return the first in the range
return id;
}
public static void registerVBO(int displayList, VertexBuffer vertexBuffer) {
if(displayList > vertexBuffers.size()) {
vertexBuffers.ensureCapacity(displayList * 2);
}
vertexBuffers.add(displayList, vertexBuffer);
}
public static VertexBuffer get(int list) {
return vertexBuffers.get(list);
}
}
@@ -1,8 +1,8 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.vbo;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.glsm.VBOManager;
import net.minecraft.client.model.ModelRenderer;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
@@ -10,38 +10,32 @@ import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.ArrayList;
@Mixin(ModelRenderer.class)
public class MixinModelRenderer {
@Shadow
public int displayList;
private static int nextDisplayList = 0;
private static int getNextDisplayList() {
return nextDisplayList++;
}
private static ArrayList<VertexBuffer> vertexBuffers = new ArrayList<>();
@Redirect(method = "compileDisplayList", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I"))
public int generateDisplayLists(int range) {
return getNextDisplayList();
return VBOManager.generateDisplayLists(range);
}
@Redirect(method = "compileDisplayList", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glNewList(II)V", remap = false))
public void startCapturingVBO(int list, int mode) {
TessellatorManager.startCapturing();
}
@Redirect(method = "compileDisplayList", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glEndList()V", remap = false))
public void stopCapturingVBO() {
vertexBuffers.add(this.displayList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION_TEXTURE_NORMAL));
VBOManager.registerVBO(this.displayList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION_TEXTURE_NORMAL));
}
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glCallList(I)V", remap = false))
public void renderVBO(int list) {
vertexBuffers.get(list).render(GL11.GL_QUADS);
VBOManager.get(list).render(GL11.GL_QUADS);
}
@Redirect(method = "renderWithRotation", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glCallList(I)V", remap = false))
public void renderWithRotationVBO(int list) {
vertexBuffers.get(list).render(GL11.GL_QUADS);
VBOManager.get(list).render(GL11.GL_QUADS);
}
}
@@ -1,31 +1,33 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.vbo;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.glsm.VBOManager;
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalVBOCapture;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.client.renderer.Tessellator;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(value = RenderGlobal.class, remap = false)
public class MixinRenderGlobal implements IRenderGlobalVBOCapture {
@Unique private VertexBuffer starVBO;
@Unique private VertexBuffer skyVBO;
@Unique private VertexBuffer sky2VBO;
@Shadow public int starGLCallList;
@Shadow private int glSkyList;
@Shadow private int glSkyList2;
private static final int MAGIC_NUMER = -1000;
private static final int STARS = MAGIC_NUMER;
private static final int SKY = MAGIC_NUMER + 1;
private static final int SKY2 = MAGIC_NUMER + 2;
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I"))
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 0))
private int generateGLRenderListBaseDisplayLists(int range) {
return AngelicaConfig.enableSodium ? -1 : GLAllocation.generateDisplayLists(range);
}
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 2))
private int generateDisplayLists(int range) {
// Don't allocate the display lists, we'll be making VBOs instead. Return a magic number for identification below.
return MAGIC_NUMER;
return VBOManager.generateDisplayLists(range);
}
@Override
@@ -37,7 +39,7 @@ public class MixinRenderGlobal implements IRenderGlobalVBOCapture {
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 0))
public void finishStarsVBO() {
this.starVBO = TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION);
VBOManager.registerVBO(starGLCallList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION));
}
@Redirect(method="<init>", at = @At(value="FIELD", target="Lnet/minecraft/client/renderer/Tessellator;instance:Lnet/minecraft/client/renderer/Tessellator;"))
@@ -55,7 +57,7 @@ public class MixinRenderGlobal implements IRenderGlobalVBOCapture {
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 1))
public void finishSkyVBO() {
this.skyVBO = TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION);
VBOManager.registerVBO(glSkyList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION));
}
@Override
@@ -67,17 +69,11 @@ public class MixinRenderGlobal implements IRenderGlobalVBOCapture {
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 2))
public void finishSky2VBO() {
this.sky2VBO = TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION);
VBOManager.registerVBO(glSkyList2, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION));
}
@Redirect(method="renderSky(F)V", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glCallList(I)V"))
public void renderSky(int list) {
VertexBuffer vbo = switch (list) {
case STARS -> this.starVBO;
case SKY -> this.skyVBO;
case SKY2 -> this.sky2VBO;
default -> throw new RuntimeException("Unexpected display list: " + list);
};
vbo.render(GL11.GL_QUADS);
VBOManager.get(list).render(GL11.GL_QUADS);
}
}