fix: avoid macOS reduced resolution over-scaling

Author: FlashyReese

common/src/main/java/me/flashyreese/mods/sodiumextra/client/util/MacReducedResolution.java

@@ -1,9 +1,13 @@
 package me.flashyreese.mods.sodiumextra.client.util;
 
+import com.mojang.blaze3d.systems.GpuSurface;
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
 import net.minecraft.util.Util;
 
 public final class MacReducedResolution {
+    private static int windowWidth = -1;
+    private static int windowHeight = -1;
+
     public static boolean isEnabled() {
         return Util.getPlatform() == Util.OS.OSX && SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac;
     }
@@ -12,7 +16,28 @@ public static int reduce(int value) {
         return Math.max(1, value / 2);
     }
 
+    public static void rememberWindowSize(int width, int height) {
+        windowWidth = width;
+        windowHeight = height;
+    }
+
+    public static boolean shouldReduceFramebuffer(int framebufferWidth, int framebufferHeight, int windowWidth, int windowHeight) {
+        return isEnabled() && isHighDpiFramebuffer(framebufferWidth, framebufferHeight, windowWidth, windowHeight);
+    }
+
+    public static GpuSurface.Configuration reduceSurfaceConfiguration(GpuSurface.Configuration config) {
+        if (!shouldReduceFramebuffer(config.width(), config.height(), windowWidth, windowHeight)) {
+            return config;
+        }
+
+        return new GpuSurface.Configuration(reduce(config.width()), reduce(config.height()), config.presentMode());
+    }
+
     public static boolean shouldScalePresentation(int sourceWidth, int sourceHeight, int targetWidth, int targetHeight) {
         return isEnabled() && (sourceWidth < targetWidth || sourceHeight < targetHeight);
     }
+
+    private static boolean isHighDpiFramebuffer(int framebufferWidth, int framebufferHeight, int windowWidth, int windowHeight) {
+        return windowWidth > 0 && windowHeight > 0 && (framebufferWidth > windowWidth || framebufferHeight > windowHeight);
+    }
 }

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/reduce_resolution_on_mac/MixinVulkanGpuSurface.java

@@ -2,6 +2,7 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.systems.CommandEncoderBackend;
+import com.mojang.blaze3d.systems.GpuSurface;
 import com.mojang.blaze3d.textures.GpuTextureView;
 import com.mojang.blaze3d.vulkan.VulkanGpuSurface;
 import me.flashyreese.mods.sodiumextra.client.util.MacReducedResolution;
@@ -11,6 +12,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(VulkanGpuSurface.class)
@@ -21,6 +23,11 @@ public class MixinVulkanGpuSurface {
     @Shadow
     private int swapchainHeight;
 
+    @ModifyVariable(method = "configure", at = @At("HEAD"), argsOnly = true)
+    private GpuSurface.Configuration reduceSwapchainConfiguration(GpuSurface.Configuration config) {
+        return MacReducedResolution.reduceSurfaceConfig uration(config);
+    }
+
     @Inject(method = "blitFromTexture", at = @At(value = "INVOKE", target = "Lorg/lwjgl/vulkan/VK12;vkCmdBlitImage(Lorg/lwjgl/vulkan/VkCommandBuffer;JIJILorg/lwjgl/vulkan/VkImageBlit$Buffer;I)V", remap = false))
     private void scalePresentedTexture(CommandEncoderBackend commandEncoder, GpuTextureView textureView, CallbackInfo ci, @Local(ordinal = 0) VkImageBlit.Buffer blitRegion) {
         if (!MacReducedResolution.shouldScalePresentation(textureView.getWidth(0), textureView.getHeight(0), this.swapchainWidth, this.swapchainHeight)) {

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/reduce_resolution_on_mac/MixinWindow.java

@@ -21,6 +21,12 @@
  */
 @Mixin(Window.class)
 public class MixinWindow {
+    @Shadow
+    private int width;
+
+    @Shadow
+    private int height;
+
     @Shadow
     private int framebufferWidth;
 
@@ -39,11 +45,13 @@ private void afterFramebufferResize(long handle, int newWidth, int newHeight, Ca
 
     @Unique
     private void scaleFramebufferSize() {
-        if (!MacReducedResolution.isEnabled()) {
+        MacReducedResolution.rememberWindowSize(this.width, this.height);
+
+        if (!MacReducedResolution.shouldReduceFramebuffer(this.framebufferWidth, this.framebufferHeight, this.width, this.height)) {
             return;
         }
 
-        framebufferWidth = MacReducedResolution.reduce(framebufferWidth);
-        framebufferHeight = MacReducedResolution.reduce(framebufferHeight);
+        this.framebufferWidth = MacReducedResolution.reduce(this.framebufferWidth);
+        this.framebufferHeight = MacReducedResolution.reduce(this.framebufferHeight);
     }
 }