[1.20.4] Feat: Common buffer interface

build.gradle.kts

@@ -1,5 +1,8 @@
+import org.gradle.internal.jvm.*
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import java.io.FileNotFoundException
 import java.util.*
 
 val modId: String by project
@@ -66,6 +69,17 @@ subprojects {
     if (path == ":common") return@subprojects
 
     tasks {
+        register<Exec>("renderDoc") {
+            val javaHome = Jvm.current().javaHome
+            val gradleWrapper = rootProject.tasks.wrapper.get().jarFile.absolutePath
+
+            commandLine = listOf(
+                findExecutable("renderdoccmd")
+                    ?: throw FileNotFoundException("Could not find the renderdoccmd executable"),
+                "capture", /* Remove the following 2 lines if you don't want api validation */ "--opt-api-validation", "--opt-api-validation-unmute", "--opt-hook-children", "--wait-for-exit", "--working-dir", ".", "$javaHome/bin/java", "-Xmx64m", "-Xms64m", /*"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005",*/ "-Dorg.gradle.appname=gradlew", "-Dorg.gradle.java.home=$javaHome", "-classpath", gradleWrapper, "org.gradle.wrapper.GradleWrapperMain", "${this@subprojects.path}:runClient",
+            )
+        }
+
         processResources {
             // Replaces placeholders in the mod info files
             filesMatching(targets) {
@@ -118,3 +132,10 @@ allprojects {
         }
     }
 }
+
+private fun findExecutable(executable: String): String? {
+    val isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
+    val cmd = if (isWindows) "where" else "which"
+
+    return ProcessBuilder(cmd, executable).start().inputStream.bufferedReader().readText().trim().takeIf { it.isNotBlank() }
+}

common/src/main/java/com/lambda/mixin/render/VertexBufferMixin.java

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.graphics.gl.VaoUtils;
+import com.lambda.graphics.buffer.vertex.ElementBuffer;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gl.VertexBuffer;
 import net.minecraft.client.render.BufferBuilder;
@@ -37,6 +37,6 @@ public class VertexBufferMixin {
     @Inject(method = "uploadIndexBuffer", at = @At("RETURN"))
     private void onConfigureIndexBuffer(BufferBuilder.DrawParameters parameters, ByteBuffer vertexBuffer, CallbackInfoReturnable<RenderSystem.ShapeIndexBuffer> cir) {
         RenderSystem.ShapeIndexBuffer value = cir.getReturnValue();
-        VaoUtils.lastIbo = value == null ? this.indexBufferId : value.id;
+        ElementBuffer.lastIbo = value == null ? this.indexBufferId : value.id;
     }
 }

common/src/main/kotlin/com/lambda/graphics/animation/Animation.kt

@@ -18,8 +18,8 @@
 package com.lambda.graphics.animation
 
 import com.lambda.Lambda.mc
-import com.lambda.util.math.lerp
 import com.lambda.util.extension.partialTicks
+import com.lambda.util.math.lerp
 import kotlin.math.abs
 import kotlin.reflect.KProperty
 

common/src/main/kotlin/com/lambda/graphics/buffer/FrameBuffer.kt

@@ -19,9 +19,8 @@ package com.lambda.graphics.buffer
 
 import com.lambda.Lambda.mc
 import com.lambda.graphics.RenderMain
-import com.lambda.graphics.buffer.vao.VAO
-import com.lambda.graphics.buffer.vao.vertex.VertexAttrib
-import com.lambda.graphics.buffer.vao.vertex.VertexMode
+import com.lambda.graphics.buffer.vertex.attributes.VertexAttrib
+import com.lambda.graphics.buffer.vertex.attributes.VertexMode
 import com.lambda.graphics.gl.GlStateUtils.withBlendFunc
 import com.lambda.graphics.shader.Shader
 import com.lambda.graphics.texture.TextureUtils.bindTexture
@@ -67,7 +66,7 @@ class FrameBuffer(private val depth: Boolean = false) {
         shader.use()
         shaderBlock(shader)
 
-        vao.use {
+        pipeline.use {
             grow(4)
 
             val uv1 = pos1 / RenderMain.screenSize
@@ -82,9 +81,9 @@ class FrameBuffer(private val depth: Boolean = false) {
         }
 
         withBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA) {
-            vao.upload()
-            vao.render()
-            vao.clear()
+            pipeline.upload()
+            pipeline.render()
+            pipeline.clear()
         }
 
         return this
@@ -149,7 +148,7 @@ class FrameBuffer(private val depth: Boolean = false) {
     }
 
     companion object {
-        private val vao = VAO(VertexMode.TRIANGLES, VertexAttrib.Group.POS_UV)
+        private val pipeline = VertexPipeline(VertexMode.TRIANGLES, VertexAttrib.Group.POS_UV)
         private var lastFrameBuffer: Int? = null
     }
 }