Remove fast dynamic resolution in main branch

Author: UltimateBoomer

src/main/java/io/github/ultimateboomer/resolutioncontrol/ResolutionControlMod.java

@@ -106,11 +106,6 @@ public void onInitialize() {
 		});
 
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
-//			long frametime = client.metricsData.getSamples()[0];
-//			if (frametime > 0) {
-//				System.out.println(1_000_000_000 / frametime);
-//			}
-
 			if (ConfigHandler.instance.getConfig().enableDynamicResolution && client.world != null
 					&& getWindow().getX() != -32000) {
 				DynamicResolutionHandler.INSTANCE.tick();
@@ -147,16 +142,6 @@ public void setShouldScale(boolean shouldScale) {
 			);
 			calculateSize();
 		}
-
-		if (getEnableFastDynamicResolution()) {
-			if (DynamicResolutionHandler.INSTANCE.isFramebufferMapEmpty()) {
-				initScaledFramebuffers();
-
-				DynamicResolutionHandler.INSTANCE.generateFrameBuffers(
-						getWindow().getFramebufferWidth(), getWindow().getFramebufferHeight(), scaledFramebuffers);
-			}
-
-		}
 
 		this.shouldScale = shouldScale;
 
@@ -244,17 +229,7 @@ private void initMinecraftFramebuffers() {
 	}
 
 	public Framebuffer getFramebuffer() {
-		if (getEnableFastDynamicResolution()) {
-			if (DynamicResolutionHandler.INSTANCE.isFramebufferMapEmpty()) {
-//				setFramebufferReference();
-				DynamicResolutionHandler.INSTANCE.generateFrameBuffers(
-						getWindow().getFramebufferWidth(), getWindow().getFramebufferHeight(), scaledFramebuffers);
-			}
-
-			return DynamicResolutionHandler.INSTANCE.getCurrentFramebuffer(framebuffer);
-		} else {
-			return framebuffer;
-		}
+		return framebuffer;
 	}
 
 	public void initScreenshotFramebuffer() {
@@ -388,17 +363,7 @@ public void setEnableDynamicResolution(boolean enableDynamicResolution) {
 		}
 	}
 
-	public boolean getEnableFastDynamicResolution() {
-		return Config.getInstance().enableDynamicResolution && Config.getInstance().fastDynamicResolution;
-	}
-
 	public void onResolutionChanged() {
-		if (client.world != null && getEnableFastDynamicResolution()) {
-
-			DynamicResolutionHandler.INSTANCE.generateFrameBuffers(
-					getWindow().framebufferWidth, getWindow().framebufferHeight, scaledFramebuffers);
-		}
-
 		updateFramebufferSize();
 	}
 
@@ -413,12 +378,7 @@ public void updateFramebufferSize() {
 
 	public void resizeMinecraftFramebuffers() {
 		initMinecraftFramebuffers();
-
-		if (getEnableFastDynamicResolution()) {
-		} else {
-			minecraftFramebuffers.forEach(this::resize);
-		}
-
+		minecraftFramebuffers.forEach(this::resize);
 	}
 
 	public void calculateSize() {
@@ -441,23 +401,11 @@ public void resize(@Nullable Framebuffer framebuffer) {
 					MinecraftClient.IS_SYSTEM_MAC
 			);
 		} else {
-			if (getEnableFastDynamicResolution()) {
-				if (lastWidth != getWindow().framebufferWidth && lastHeight != getWindow().framebufferHeight) {
-					framebuffer.resize(
-							Math.max(getWindow().framebufferWidth, 1),
-							Math.max(getWindow().framebufferHeight, 1),
-							MinecraftClient.IS_SYSTEM_MAC
-					);
-					lastWidth = getWindow().framebufferWidth;
-					lastHeight = getWindow().framebufferHeight;
-				}
-			} else {
-				framebuffer.resize(
-						getWindow().getFramebufferWidth(),
-						getWindow().getFramebufferHeight(),
-						MinecraftClient.IS_SYSTEM_MAC
-				);
-			}
+			framebuffer.resize(
+					getWindow().getFramebufferWidth(),
+					getWindow().getFramebufferHeight(),
+					MinecraftClient.IS_SYSTEM_MAC
+			);
 		}
 		shouldScale = prev;
 	}

src/main/java/io/github/ultimateboomer/resolutioncontrol/mixin/WorldRendererMixin.java

@@ -14,7 +14,6 @@ public final class Config {
 	public boolean screenshotFramebufferAlwaysAllocated = false;
 
 	public boolean enableDynamicResolution = false;
-	public boolean fastDynamicResolution = false;
 
 	public float drMinScale = 0.5f;
 	public float drMaxScale = 2.0f;

src/main/java/io/github/ultimateboomer/resolutioncontrol/util/Config.java

@@ -3,26 +3,16 @@
 import io.github.ultimateboomer.resolutioncontrol.ResolutionControlMod;
 import it.unimi.dsi.fastutil.floats.FloatArrayList;
 import it.unimi.dsi.fastutil.floats.FloatList;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.Framebuffer;
-import net.minecraft.text.LiteralText;
-
-import java.util.*;
 
 public class DynamicResolutionHandler {
     public static final DynamicResolutionHandler INSTANCE = new DynamicResolutionHandler();
-
-    private final Map<Framebuffer, List<Framebuffer>> frameBufferMap = new HashMap<>();
     private final FloatList scales = new FloatArrayList();
     private int baseScale;
 
     private int timer = 10;
     private int currentScale;
 
-    private int lastWidth;
-    private int lastHeight;
-
     private DynamicResolutionHandler() {
         reset();
     }
@@ -76,50 +66,10 @@ private void setCurrentScale(int currentScale) {
 
         if (!equal) {
             ResolutionControlMod.getInstance().updateFramebufferSize();
-            MinecraftClient.getInstance().player.sendMessage(
-                    new LiteralText("Res: " + getCurrentScale()), false);
         }
     }
 
     public double getCurrentScale() {
         return scales.getFloat(currentScale);
     }
-
-    public Framebuffer getCurrentFramebuffer(Framebuffer key) {
-        List<Framebuffer> list = frameBufferMap.get(key);
-        if (list == null) {
-            return null;
-        } else {
-            return list.get(currentScale);
-        }
-    }
-
-    public void generateFrameBuffers(int baseWidth, int baseHeight, Collection<Framebuffer> fbs) {
-        if (lastWidth != baseWidth && lastHeight != baseHeight) {
-            frameBufferMap.forEach((framebuffer, list) -> list.forEach(Framebuffer::delete));
-            frameBufferMap.clear();
-
-            fbs.forEach(framebuffer -> {
-                System.out.println(framebuffer.textureWidth + " " + framebuffer.textureHeight);
-
-                List<Framebuffer> framebufferList = new ObjectArrayList<>(scales.size());
-                for (int i = 0; i < scales.size(); i++) {
-                    float scale = scales.getFloat(i);
-
-                    Framebuffer newFb = new Framebuffer(
-                            (int) Math.max(baseWidth * scale, 1), (int) Math.max(baseHeight * scale, 1),
-                            true, false);
-                    framebufferList.add(newFb);
-                }
-                frameBufferMap.put(framebuffer, framebufferList);
-            });
-
-            lastWidth = baseWidth;
-            lastHeight = baseHeight;
-        }
-    }
-
-    public boolean isFramebufferMapEmpty() {
-        return frameBufferMap.isEmpty();
-    }
 }

src/main/java/io/github/ultimateboomer/resolutioncontrol/util/DynamicResolutionHandler.java

@@ -9,7 +9,6 @@
     "GameRendererMixin",
     "MinecraftClientMixin",
     "WindowMixin",
-    "WorldRendererMixin",
     "FramebufferMixin"
   ],
   "injectors": {