Fix desync in color attachments from render targets (POLYPLUS3-5S)

CHANGELOG.md

@@ -1,2 +1,3 @@
-## 2.0.2
-- Fix rendering issues on NVIDIA graphics cards
+## 2.0.3
+- Fix iris compat on hand
+- Fix other rare crashes

gradle.properties

@@ -9,7 +9,7 @@ loom.ignoreDependencyLoomVersionValidation=true
 # Mod information
 mod.name=PolyBlur
 mod.id=polyblur
-mod.version=2.0.2
+mod.version=2.0.3
 mod.group=org.polyfrost
 
 # Loom settings, [VERSIONED] means to be overridden in each version's gradle.properties

src/main/kotlin/org/polyfrost/polyblur/client/blur/motion/HybridWorldPass.kt

@@ -11,13 +11,15 @@ object HybridWorldPass {
         val snapshot = WorldSnapshotTracker.ensure(mainTarget) ?: return
 
         if (WorldCamera.velocitySettled) {
-            RenderTargetTracker.blit(mainTarget, snapshot)
+            WorldSnapshotTracker.markCaptured(RenderTargetTracker.blit(mainTarget, snapshot))
             return
         }
 
         MotionVelocityPass.run(mainTarget)
-        if (!MotionBlurReproject.render(mainTarget, snapshot)) {
-            RenderTargetTracker.blit(mainTarget, snapshot)
+        if (MotionBlurReproject.render(mainTarget, snapshot)) {
+            WorldSnapshotTracker.markCaptured(true)
+        } else {
+            WorldSnapshotTracker.markCaptured(RenderTargetTracker.blit(mainTarget, snapshot))
         }
     }
 }

src/main/kotlin/org/polyfrost/polyblur/client/blur/motion/MotionBlur.kt

@@ -225,6 +225,8 @@ object MotionBlur {
     @JvmStatic
     @Suppress("UNUSED_PARAMETER")
     fun render(renderTarget: RenderTarget, resourcePool: CrossFrameResourcePool) {
+        if (!RenderTargetTracker.isAttachmentInSync(renderTarget)) return
+
         InternalTargetTracker.updateSize(renderTarget.width, renderTarget.height)
 
         val tempTarget = InternalTargetTracker.target ?: return

src/main/kotlin/org/polyfrost/polyblur/client/blur/motion/MotionBlurReproject.kt

@@ -99,6 +99,8 @@ object MotionBlurReproject {
         val velTarget = VelocityTarget.current ?: return false
         if (!WorldCamera.hasPrev) return false
 
+        if (!RenderTargetTracker.isAttachmentInSync(renderTarget)) return false
+
         val tempTarget = outTarget ?: run {
             InternalTargetTracker.updateSize(renderTarget.width, renderTarget.height)
             InternalTargetTracker.target ?: return false
@@ -137,8 +139,7 @@ object MotionBlurReproject {
             FullscreenPass.draw(renderPass)
         }
 
-        RenderTargetTracker.blit(tempTarget, renderTarget)
-        return true
+        return RenderTargetTracker.blit(tempTarget, renderTarget)
     }
 }
 //?}

src/main/kotlin/org/polyfrost/polyblur/client/blur/motion/MotionBlurReproject1215.kt

@@ -47,6 +47,8 @@ object MotionBlurReproject {
         val velTarget = VelocityTarget.current ?: return
         if (!WorldCamera.hasPrev) return
 
+        if (!RenderTargetTracker.isAttachmentInSync(renderTarget)) return
+
         InternalTargetTracker.updateSize(renderTarget.width, renderTarget.height)
         val tempTarget = InternalTargetTracker.target ?: return
 

src/main/kotlin/org/polyfrost/polyblur/client/blur/phosphor/BlitPlan.kt

@@ -0,0 +1,36 @@
+package org.polyfrost.polyblur.client.blur.phosphor
+
+enum class BlitPlan {
+    COPY,
+    DRAW,
+    SKIP,
+}
+
+fun planBlit(
+    srcWidth: Int,
+    srcHeight: Int,
+    srcTextureWidth: Int,
+    srcTextureHeight: Int,
+    dstWidth: Int,
+    dstHeight: Int,
+    dstTextureWidth: Int,
+    dstTextureHeight: Int,
+): BlitPlan {
+    if (srcTextureWidth <= 0 || srcTextureHeight <= 0 || dstTextureWidth <= 0 || dstTextureHeight <= 0) {
+        return BlitPlan.SKIP
+    }
+
+    if (srcTextureWidth != srcWidth || srcTextureHeight != srcHeight) {
+        return BlitPlan.SKIP
+    }
+
+    if (dstTextureWidth != dstWidth || dstTextureHeight != dstHeight) {
+        return BlitPlan.SKIP
+    }
+
+    return if (srcTextureWidth == dstTextureWidth && srcTextureHeight == dstTextureHeight) {
+        BlitPlan.COPY
+    } else {
+        BlitPlan.DRAW
+    }
+}

src/main/kotlin/org/polyfrost/polyblur/client/blur/phosphor/HybridHandPhosphor.kt

@@ -101,6 +101,11 @@ object HybridHandPhosphor {
         renderInner(renderTarget)
 
     private fun renderInner(renderTarget: RenderTarget) {
+        if (!RenderTargetTracker.isAttachmentInSync(renderTarget)) {
+            RenderTargetTracker.requireBootstrap()
+            return
+        }
+
         RenderTargetTracker.ensureSize(renderTarget.width, renderTarget.height)
 
         val prevTarget = RenderTargetTracker.prevTarget
@@ -146,8 +151,11 @@ object HybridHandPhosphor {
             FullscreenPass.draw(renderPass)
         }
 
-        RenderTargetTracker.blit(tempTarget, renderTarget)
-        RenderTargetTracker.swap()
+        if (RenderTargetTracker.blit(tempTarget, renderTarget)) {
+            RenderTargetTracker.swap()
+        } else {
+            RenderTargetTracker.requireBootstrap()
+        }
     }
 }
 //?}

src/main/kotlin/org/polyfrost/polyblur/client/blur/phosphor/PhosphorBlur.kt

@@ -327,6 +327,11 @@ object PhosphorBlur {
         renderInner(renderTarget)
 
     private fun renderInner(renderTarget: RenderTarget) {
+        if (!RenderTargetTracker.isAttachmentInSync(renderTarget)) {
+            RenderTargetTracker.requireBootstrap()
+            return
+        }
+
         RenderTargetTracker.ensureSize(renderTarget.width, renderTarget.height)
 
         val prevTarget = RenderTargetTracker.prevTarget
@@ -366,8 +371,11 @@ object PhosphorBlur {
             FullscreenPass.draw(renderPass)
         }
 
-        RenderTargetTracker.blit(tempTarget, renderTarget)
-        RenderTargetTracker.swap()
+        if (RenderTargetTracker.blit(tempTarget, renderTarget)) {
+            RenderTargetTracker.swap()
+        } else {
+            RenderTargetTracker.requireBootstrap()
+        }
     }
 }
 //?}