Remove CoreShaderRegistrationCallback as its no longer required. (#4063)

FabricMC · Sep 4, 2024 · 2ade441 · 2ade441
1 parent 42a8e21
commit 2ade441
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 87 deletions.
diff --git a/...ient/java/net/fabricmc/fabric/api/client/rendering/v1/CoreShaderRegistrationCallback.java b/...ient/java/net/fabricmc/fabric/api/client/rendering/v1/CoreShaderRegistrationCallback.java
diff --git a/...v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java b/...v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java
@@ -16,35 +16,43 @@
 
 package net.fabricmc.fabric.test.rendering.client;
 
-import net.minecraft.client.gl.ShaderProgram;
+import com.mojang.blaze3d.systems.RenderSystem;
+import org.joml.Matrix4f;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.Defines;
+import net.minecraft.client.gl.ShaderProgramKey;
+import net.minecraft.client.gl.ShaderProgramKeys;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.BufferRenderer;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.util.Window;
 import net.minecraft.util.Identifier;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.CoreShaderRegistrationCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 
 /**
- * Tests {@link HudRenderCallback} and {@link CoreShaderRegistrationCallback} by drawing a green rectangle
+ * Tests {@link HudRenderCallback} and custom shaders by drawing a green rectangle
  * in the lower-right corner of the screen.
  */
 public class HudAndShaderTest implements ClientModInitializer {
-	private static ShaderProgram testShader;
+	private static final ShaderProgramKey TEST_SHADER = new ShaderProgramKey(
+			Identifier.of("fabric-rendering-v1-testmod", "core/test"),
+			VertexFormats.POSITION, Defines.EMPTY);
 
 	@Override
 	public void onInitializeClient() {
-		CoreShaderRegistrationCallback.EVENT.register(context -> {
-			// Register a custom shader taking POSITION vertices.
-			Identifier id = Identifier.of("fabric-rendering-v1-testmod", "test");
-			context.register(id, VertexFormats.POSITION, program -> testShader = program);
-		});
+		ShaderProgramKeys.getAll().add(TEST_SHADER);
 
-		/*HudRenderCallback.EVENT.register((drawContext, tickDelta) -> {
+		HudRenderCallback.EVENT.register((drawContext, tickDelta) -> {
 			MinecraftClient client = MinecraftClient.getInstance();
 			Window window = client.getWindow();
 			int x = window.getScaledWidth() - 15;
 			int y = window.getScaledHeight() - 15;
-			RenderSystem.setShader(testShader);
+			RenderSystem.setShader(TEST_SHADER);
 			RenderSystem.setShaderColor(0f, 1f, 0f, 1f);
 			Matrix4f positionMatrix = drawContext.getMatrices().peek().getPositionMatrix();
 			BufferBuilder buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
@@ -55,6 +63,6 @@ public void onInitializeClient() {
 			BufferRenderer.drawWithGlobalProgram(buffer.end());
 			// Reset shader color
 			RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
-		});*/
+		});
 	}
 }
diff --git a/...-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json b/...-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json
@@ -4,8 +4,8 @@
     "srcrgb": "srcalpha",
     "dstrgb": "1-srcalpha"
   },
-  "vertex": "fabric-rendering-v1-testmod:test",
-  "fragment": "fabric-rendering-v1-testmod:test",
+  "vertex": "fabric-rendering-v1-testmod:core/test",
+  "fragment": "fabric-rendering-v1-testmod:core/test",
   "attributes": [
   ],
   "samplers": [