Merge branch '1.20.x' into vk12Bindless3.1

xCollateral · Jul 26, 2024 · eec7458 · eec7458
2 parents da63333 + 32c37c1
commit eec7458
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,6 +12,6 @@ loader_version=0.15.7
 fabric_version=0.96.4+1.20.4
 
 # Mod Properties
-mod_version = 0.4.4
+mod_version = 0.4.5_dev
 maven_group = net.vulkanmod
 archives_base_name = VulkanMod_1.20.4
diff --git a/src/main/java/net/vulkanmod/mixin/render/RenderSystemMixin.java b/src/main/java/net/vulkanmod/mixin/render/RenderSystemMixin.java
@@ -20,6 +20,8 @@
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.util.function.Consumer;
 
@@ -213,14 +215,8 @@ public static void clearDepth(double d) {
         VRenderSystem.clearDepth(d);
     }
 
-    /**
-     * @author
-     */
-    @Overwrite(remap = false)
-    public static void flipFrame(long window) {
-        org.lwjgl.glfw.GLFW.glfwPollEvents();
-        RenderSystem.replayQueue();
-        Tesselator.getInstance().getBuilder().clear();
+    @Redirect(method = "flipFrame", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSwapBuffers(J)V"), remap = false)
+    private static void removeSwapBuffers(long window) {
     }
 
     /**