Fix pipeline configs

Author: xCollateral

src/main/java/net/vulkanmod/render/shader/PipelineConfigs.java

@@ -9,7 +9,6 @@
 public class PipelineConfigs {
     public static final PipelineConfig.UB TERRAIN_UB0 = PipelineConfig.UB.builder(0, VK_SHADER_STAGE_VERTEX_BIT)
                                                     .addUniform("mat4", "MVP")
-                                                    .addUniform("int", "CurrentTime")
                                                     .build();
 
     public static final PipelineConfig.UB TERRAIN_UB1 = PipelineConfig.UB.builder(1, VK_SHADER_STAGE_ALL_GRAPHICS)
@@ -21,15 +20,8 @@ public class PipelineConfigs {
                                                                   .addUniform("float", "FogSkyEnd")
                                                                   .addUniform("float", "FogCloudsEnd")
                                                                   .addUniform("float", "AlphaCutout")
-                                                                  .addUniform("vec2", "TextureSize")
-                                                                  .addUniform("vec2", "TexelSize")
-                                                                  .addUniform("int", "UseRgss")
                                                                   .build();
 
-    public static final PipelineConfig.UB TERRAIN_UB2 = PipelineConfig.UB.builder(2, VK_SHADER_STAGE_VERTEX_BIT)
-                                                    .setSize(4096)
-                                                    .build();
-
     public static final PipelineConfig.UB TERRAIN_PC = PipelineConfig.UB.builder(0, VK_SHADER_STAGE_VERTEX_BIT) // Binding ignored
                                                                  .addUniform("vec3", "ModelOffset")
                                                                   .build();
@@ -39,18 +31,16 @@ public class PipelineConfigs {
                                                         .withShader(SPIRVUtils.ShaderKind.FRAGMENT_SHADER, "terrain/terrain")
                                                         .addUB(TERRAIN_UB0)
                                                         .addUB(TERRAIN_UB1)
-                                                        .addUB(TERRAIN_UB2)
                                                         .setPushConstants(TERRAIN_PC)
-                                                        .addImageDescriptor(3, "sampler2D", "Sampler0", 0)
-                                                        .addImageDescriptor(4, "sampler2D", "LightTexture", 2)
+                                                        .addImageDescriptor(2, "sampler2D", "Sampler0", 0)
+                                                        .addImageDescriptor(3, "sampler2D", "LightTexture", 2)
                                                         .build();
 
     static final PipelineConfig TERRAIN_EARLY_Z_CONFIG = PipelineConfig.builder()
                                                                        .withShader(SPIRVUtils.ShaderKind.VERTEX_SHADER, "terrain/terrain")
                                                                        .withShader(SPIRVUtils.ShaderKind.FRAGMENT_SHADER, "terrain_earlyZ/terrain_earlyZ")
                                                                        .addUB(TERRAIN_UB0)
                                                                        .addUB(TERRAIN_UB1)
-                                                                       .addUB(TERRAIN_UB2)
                                                                        .setPushConstants(TERRAIN_PC)
                                                                        .addImageDescriptor(3, "sampler2D", "Sampler0", 0)
                                                                        .addImageDescriptor(4, "sampler2D", "LightTexture", 2)

src/main/resources/assets/vulkanmod/shaders/basic/clouds/clouds.json

@@ -1,6 +1,4 @@
 {
-    "vertex": "clouds",
-    "fragment": "clouds",
     "samplers": [],
     "UBOs": [
         { "type":  "vertex", "binding": 0, "fields": [

src/main/resources/assets/vulkanmod/shaders/basic/terrain/terrain.json

@@ -1,6 +1,6 @@
 {
-    "vertex": "terrain",
-    "fragment": "terrain_earlyZ",
+    "vertex": "terrain/terrain",
+    "fragment": "terrain_earlyZ/terrain_earlyZ",
     "samplers": [
         { "name": "Sampler0" },
         { "name": "Sampler2" }