Current debug. I'm tired.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/Pipelines.kt

@@ -153,9 +153,13 @@ object Pipelines {
     @JvmStatic
     fun transformVertices(`object`: MultiRenderObject, instanceId: Int) {
         this.instanceId = instanceId
+        System.out.println("Blep1")
         TRANSFORM.useProgram()
+        System.out.println("Blep2")
         TRANSFORM.bindGlobal()
+        System.out.println("Blep3")
         TRANSFORM.bindModel(`object`)
+        System.out.println("Blep4")
         TRANSFORM.dispatch(
             GL43C.GL_SHADER_STORAGE_BARRIER_BIT,
             (`object`.maxVertex + 255) / 256,
@@ -172,7 +176,7 @@ object Pipelines {
     }
 
     fun opengGl() {
-        vao = RareCandyVertexArray(80)
+        vao = RareCandyVertexArray()
         textures = Array(3) {
             BlankTexture(Type.RGBA_BYTE, 1024, 1024, ITexture.ComputeAccess.READ_WRITE)
         }
@@ -193,7 +197,10 @@ object Pipelines {
             .addSSBO(Scope.MODEL, "TransformBuffer", 4, { ctx -> ctx.`object`.uvTransformBuffer.bufferId })
             .addSSBO(Scope.MODEL, "DstBuffer", 5, { ctx -> ctx.`object`.destBuffer })
             .addUniform(Scope.MODEL, "variantSize", { uniform, ctx -> uniform.uploadInt(ctx.`object`.meshes.size) })
-            .addUniform(Scope.GLOBAL, "instanceId", { uniform, ctx -> uniform.uploadInt(instanceId) })
+            .addUniform(Scope.GLOBAL, "instanceId", { uniform, ctx ->
+                System.out.println("I'm a retard")
+                uniform.uploadInt(instanceId)
+                System.out.println("wtf")})
             .build()
         PARADOX = manager.shader("paradox")
             .autoInt(Scope.GLOBAL, "frame", { pingpong(MinecraftClientGameProvider.getTimePassed()) })

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/RareCandyVertexArray.java

@@ -4,67 +4,51 @@
 
 public final class RareCandyVertexArray {
 
-    private final int vao;
-    private final int vertexStride;
-
-    // binding index used for all vertex attributes
-    private static final int VERTEX_BINDING = 0;
+    private static final int STRIDE = 36;
+    private static final int BINDING = 0;
 
-    public RareCandyVertexArray(int strideBytes) {
-        this.vertexStride = strideBytes;
-        this.vao = GL43.glGenVertexArrays();
-        setupAttributes();
-    }
+    private final int vao;
 
-    private void setupAttributes() {
+    public RareCandyVertexArray() {
+        vao = GL43.glGenVertexArrays();
         GL43.glBindVertexArray(vao);
 
-        // Position (vec3) @ location 0
+        // Position
         GL43.glEnableVertexAttribArray(0);
         GL43.glVertexAttribFormat(0, 3, GL43.GL_FLOAT, false, 0);
-        GL43.glVertexAttribBinding(0, VERTEX_BINDING);
+        GL43.glVertexAttribBinding(0, BINDING);
 
-        // Color (vec4) @ location 1
+        // Color
         GL43.glEnableVertexAttribArray(1);
-        GL43.glVertexAttribFormat(1, 4, GL43.GL_FLOAT, false, 12);
-        GL43.glVertexAttribBinding(1, VERTEX_BINDING);
+        GL43.glVertexAttribFormat(1, 4, GL43.GL_UNSIGNED_BYTE, true, 12);
+        GL43.glVertexAttribBinding(1, BINDING);
 
-        // UV0 (vec2) @ location 2
+        // UV0
         GL43.glEnableVertexAttribArray(2);
-        GL43.glVertexAttribFormat(2, 2, GL43.GL_FLOAT, false, 28);
-        GL43.glVertexAttribBinding(2, VERTEX_BINDING);
+        GL43.glVertexAttribFormat(2, 2, GL43.GL_FLOAT, false, 16);
+        GL43.glVertexAttribBinding(2, BINDING);
 
-        // UV1 (ivec2) @ location 3
+        // UV1
         GL43.glEnableVertexAttribArray(3);
-        GL43.glVertexAttribIFormat(3, 2, GL43.GL_INT, 36);
-        GL43.glVertexAttribBinding(3, VERTEX_BINDING);
+        GL43.glVertexAttribIFormat(3, 2, GL43.GL_SHORT, 24);
+        GL43.glVertexAttribBinding(3, BINDING);
 
-        // UV2 (ivec2) @ location 4
+        // UV2
         GL43.glEnableVertexAttribArray(4);
-        GL43.glVertexAttribIFormat(4, 2, GL43.GL_INT, 44);
-        GL43.glVertexAttribBinding(4, VERTEX_BINDING);
+        GL43.glVertexAttribIFormat(4, 2, GL43.GL_SHORT, 28);
+        GL43.glVertexAttribBinding(4, BINDING);
 
-        // Normal (vec3) @ location 5
+        // Normal
         GL43.glEnableVertexAttribArray(5);
-        GL43.glVertexAttribFormat(5, 3, GL43.GL_FLOAT, false, 52);
-        GL43.glVertexAttribBinding(5, VERTEX_BINDING);
+        GL43.glVertexAttribFormat(5, 3, GL43.GL_BYTE, true, 32);
+        GL43.glVertexAttribBinding(5, BINDING);
 
         GL43.glBindVertexArray(0);
     }
 
-    /** Bind VAO only */
-    public void bind() {
+    public void bind(int vertexBuffer) {
         GL43.glBindVertexArray(vao);
-    }
-
-    /** Bind the actual vertex buffer (destBuffer) at draw time */
-    public void bindVertexBuffer(int bufferId) {
-        GL43.glBindVertexBuffer(
-                VERTEX_BINDING,
-                bufferId,
-                0,
-                vertexStride
-        );
+        GL43.glBindVertexBuffer(BINDING, vertexBuffer, 0, STRIDE);
     }
 
     public void unbind() {

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/loading/GenerationsMultiRenderObject.java

@@ -47,10 +47,7 @@ public void render(RenderStage renderStage, List<ObjectInstance> list) {
         updateSSBOs();
 
         System.out.println("vao=" + Pipelines.vao);
-        Pipelines.vao.bind();
-
-        System.out.println("glBindBuffer ARRAY_BUFFER destBuffer=" + destBuffer);
-        RenderSystem.glBindBuffer(GL43.GL_ARRAY_BUFFER, destBuffer);
+        Pipelines.vao.bind(destBuffer);
 
         for (int i = 0; i < instances.size(); i++) {
             System.out.println("instanceIndex=" + i);

common/src/main/resources/assets/generations_core/shaders/transform.cs.glsl

@@ -38,8 +38,8 @@ struct Transform {
     vec2 offset;
 };
 
-uniform uint variantSize;
-uniform uint instanceId;
+uniform int variantSize;
+uniform int instanceId;
 
 layout(std430, binding = 0) readonly  buffer SrcBuffer       { SourceVertex src[]; };
 layout(std430, binding = 1) readonly  buffer IndexBuffer     { uint indices[]; };