Merge pull request Ancurio#177 from Splendide-Imaginarius/mkxp-z-lanc…

…zos-blitting Don't use framebuffer blitting if shader-based interpolation is needed
Splendide-Imaginarius · Mar 22, 2024 · ef822d1 · ef822d1
2 parents 988ba47 + eca3120
commit ef822d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mkxp.json b/mkxp.json
@@ -243,7 +243,9 @@
     // capable of it. Some drivers carry buggy
     // implementations of this functionality, so
     // disabling it can be used as a workaround.
-    // Does nothing on macOS.
+    // Does nothing on macOS. Force-disabled when
+    // smoothScaling or smoothScalingDown isn't
+    // Nearest-Neighbor or Bilinear.
     // (default: disabled)
     //
     // "enableBlitting": false,

diff --git a/src/display/gl/gl-meta.cpp b/src/display/gl/gl-meta.cpp
@@ -138,7 +138,7 @@ void vaoUnbind(VAO &vao)
 	}
 }
 
-#define HAVE_NATIVE_BLIT gl.BlitFramebuffer
+#define HAVE_NATIVE_BLIT (gl.BlitFramebuffer && shState->config().smoothScaling <= Bilinear && shState->config().smoothScalingDown <= Bilinear)
 
 int blitScaleIsSpecial(TEXFBO &target, bool targetPreferHires, const IntRect &targetRect, TEXFBO &source, const IntRect &sourceRect)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,7 +138,7 @@ void vaoUnbind(VAO &vao) @@
     	}
     }
-    #define HAVE_NATIVE_BLIT gl.BlitFramebuffer
+    #define HAVE_NATIVE_BLIT (gl.BlitFramebuffer && shState->config().smoothScaling <= Bilinear && shState->config().smoothScalingDown <= Bilinear)
     int blitScaleIsSpecial(TEXFBO &target, bool targetPreferHires, const IntRect &targetRect, TEXFBO &source, const IntRect &sourceRect)
     {
@@ Expand Down @@