reset descriptor pools if empty when exceeded

kool-engine · Feb 4, 2025 · 63dedcd · 63dedcd
1 parent a1e9786
commit 63dedcd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/deferred/ReflectionDenoisePass.kt b/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/deferred/ReflectionDenoisePass.kt
@@ -35,6 +35,7 @@ class ReflectionDenoisePass(reflectionPass: OffscreenPass2d) :
     }
 
     fun setPositionInput(materialPass: MaterialPass) {
+        denoiseShader.createdPipeline?.swapPipelineData(materialPass)
         denoiseShader.depthTex = materialPass.positionFlags
     }
 

diff --git a/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/deferred/ReflectionPass.kt b/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/deferred/ReflectionPass.kt
@@ -48,6 +48,7 @@ class ReflectionPass(val baseReflectionStep: Float) :
     }
 
     fun setInput(lightingPass: PbrLightingPass, materialPass: MaterialPass) {
+        ssrShader.createdPipeline?.swapPipelineData(materialPass)
         ssrShader.positionFlags = materialPass.positionFlags
         ssrShader.normalRoughness = materialPass.normalRoughness
         ssrShader.lightingPass = lightingPass.colorTexture

diff --git a/kool-core/src/desktopMain/kotlin/de/fabmax/kool/pipeline/backend/vk/BindGroupDataVk.kt b/kool-core/src/desktopMain/kotlin/de/fabmax/kool/pipeline/backend/vk/BindGroupDataVk.kt
@@ -115,6 +115,7 @@ class BindGroupDataVk(
                 return
             }
 
+            backend.descriptorPools.releaseSets(poolLayout, descriptorSets)
             descriptorSets = backend.descriptorPools.allocateSets(poolLayout, gpuLayout, this)
             val numBindings = uboBindings.size + storageBufferBindings.size + textureBindings.size
             val descriptorWrite = callocVkWriteDescriptorSetN(Swapchain.MAX_FRAMES_IN_FLIGHT * numBindings) { }

diff --git a/kool-core/src/desktopMain/kotlin/de/fabmax/kool/pipeline/backend/vk/DescriptorPoolManager.kt b/kool-core/src/desktopMain/kotlin/de/fabmax/kool/pipeline/backend/vk/DescriptorPoolManager.kt
@@ -58,8 +58,17 @@ class DescriptorPoolManager(val backend: RenderBackendVk) : BaseReleasable() {
                 sets = pool.allocateSets(layout, numSets, stack)
                 if (sets == null) {
                     openPools -= pool
-                    exceededPools += pool
+
                     logD { "Descriptor pool exceeded" }
+                    if (pool.allocatedSets.isEmpty()) {
+                        ReleaseQueue.enqueue {
+                            pool.resetPool()
+                            openPools += pool
+                        }
+                    } else {
+                        exceededPools += pool
+                    }
+
                 } else {
                     sets.forEach { allocatedSets[it] = pool }
                 }
@@ -121,6 +130,7 @@ class DescriptorPoolManager(val backend: RenderBackendVk) : BaseReleasable() {
         }
 
         fun resetPool() {
+            logD { "Reset descriptor pool" }
             backend.device.resetDescriptorPool(descriptorPool)
             allocatedSets.clear()
             isExceeded = false
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         fun setPositionInput(materialPass: MaterialPass) {
+            denoiseShader.createdPipeline?.swapPipelineData(materialPass)
             denoiseShader.depthTex = materialPass.positionFlags
         }
@@ Expand Down @@