fix: skip extra macOS resolution scaling on OpenGL

Author: FlashyReese

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

@@ -5,6 +5,13 @@
 import net.minecraft.util.Util;
 
 public final class MacReducedResolution {
+    private enum Backend {
+        UNKNOWN,
+        OPENGL,
+        VULKAN
+    }
+
+    private static Backend backend = Backend.UNKNOWN;
     private static int windowWidth = -1;
     private static int windowHeight = -1;
 
@@ -16,17 +23,25 @@ public static int reduce(int value) {
         return Math.max(1, value / 2);
     }
 
+    public static void useOpenGlBackend() {
+        backend = Backend.OPENGL;
+    }
+
+    public static void useVulkanBackend() {
+        backend = Backend.VULKAN;
+    }
+
     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);
+        return isEnabled() && backend != Backend.OPENGL && isHighDpiFramebuffer(framebufferWidth, framebufferHeight, windowWidth, windowHeight);
     }
 
     public static GpuSurface.Configuration reduceSurfaceConfiguration(GpuSurface.Configuration config) {
-        if (!shouldReduceFramebuffer(config.width(), config.height(), windowWidth, windowHeight)) {
+        if (!isEnabled() || backend != Backend.VULKAN || !isHighDpiFramebuffer(config.width(), config.height(), windowWidth, windowHeight)) {
             return config;
         }
 

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

@@ -1,23 +1,21 @@
 package me.flashyreese.mods.sodiumextra.mixin.reduce_resolution_on_mac;
 
 import com.mojang.blaze3d.opengl.GlBackend;
-import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import me.flashyreese.mods.sodiumextra.client.util.MacReducedResolution;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GlBackend.class)
 public class MixinGlBackend {
-    @Unique
-    private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
-
     @Inject(method = "setWindowHints", at = @At(value = "HEAD"))
     private void preSetWindowHints(CallbackInfo ci) {
-        if (OS_NAME.contains("mac") && SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac) {
+        MacReducedResolution.useOpenGlBackend();
+
+        if (MacReducedResolution.isEnabled()) {
             GLFW.glfwWindowHint(GLFW.GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW.GLFW_FALSE);
         }
     }
-}
+}

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

@@ -1,22 +1,20 @@
 package me.flashyreese.mods.sodiumextra.mixin.reduce_resolution_on_mac;
 
 import com.mojang.blaze3d.vulkan.VulkanBackend;
-import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import me.flashyreese.mods.sodiumextra.client.util.MacReducedResolution;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(VulkanBackend.class)
 public class MixinVulkanBackend {
-    @Unique
-    private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
-
     @Inject(method = "setWindowHints", at = @At(value = "HEAD"))
     private void preSetWindowHints(CallbackInfo ci) {
-        if (OS_NAME.contains("mac") && SodiumExtraClientMod.options().extraSettings.reduceResolutionOnMac) {
+        MacReducedResolution.useVulkanBackend();
+
+        if (MacReducedResolution.isEnabled()) {
             GLFW.glfwWindowHint(GLFW.GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW.GLFW_FALSE);
         }
     }