Merge remote-tracking branch 'origin/main'

kool-engine · Dec 26, 2023 · a0f0f51 · a0f0f51
2 parents 9a23f6f + bf6bac3
commit a0f0f51
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/ComputeRenderPass.kt b/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/ComputeRenderPass.kt
@@ -24,7 +24,7 @@ class ComputeRenderPass(name: String, width: Int, height: Int = 1, depth: Int =
     val tasks: List<Task> get() {
         if (isTasksDirty) {
             _tasks
-                .filter { it.isCreated == false }
+                .filter { !it.isCreated }
                 .forEach { it.create(it.shader.getOrCreatePipeline(this)) }
             isTasksDirty = false
         }
@@ -45,8 +45,31 @@ class ComputeRenderPass(name: String, width: Int, height: Int = 1, depth: Int =
         lateinit var pipeline: ComputePipeline
             private set
 
+        private val beforeDispatch = mutableListOf<() -> Unit>()
+        private val afterDispatch = mutableListOf<() -> Unit>()
+
         fun create(pipeline: ComputePipeline) {
             this.pipeline = pipeline
         }
+
+        fun onBeforeDispatch(block: () -> Unit) {
+            beforeDispatch += block
+        }
+
+        fun onAfterDispatch(block: () -> Unit) {
+            afterDispatch += block
+        }
+
+        internal fun beforeDispatch() {
+            for (i in beforeDispatch.indices) {
+                beforeDispatch[i]()
+            }
+        }
+
+        internal fun afterDispatch() {
+            for (i in afterDispatch.indices) {
+                afterDispatch[i]()
+            }
+        }
     }
 }
diff --git a/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/backend/gl/RenderBackendGl.kt b/kool-core/src/commonMain/kotlin/de/fabmax/kool/pipeline/backend/gl/RenderBackendGl.kt
@@ -211,13 +211,17 @@ abstract class RenderBackendGl(internal val gl: GlApi, internal val ctx: KoolCon
                 val numGroupsY = ceil(computePass.height.toFloat() / pipeline.workGroupSize.y).toInt()
                 val numGroupsZ = ceil(computePass.depth.toFloat() / pipeline.workGroupSize.z).toInt()
 
+                task.beforeDispatch()
+
                 if (shaderMgr.setupComputeShader(pipeline, computePass)) {
                     val maxCnt = gl.capabilities.maxWorkGroupCount
                     if (numGroupsX > maxCnt.x || numGroupsY > maxCnt.y || numGroupsZ > maxCnt.z) {
                         logE { "Maximum compute shader workgroup count exceeded: max count = $maxCnt, requested count: ($numGroupsX, $numGroupsY, $numGroupsZ)" }
                     }
                     gl.dispatchCompute(numGroupsX, numGroupsY, numGroupsZ)
                     gl.memoryBarrier(gl.SHADER_IMAGE_ACCESS_BARRIER_BIT)
+
+                    task.afterDispatch()
                 }
             }
         }