Review changes 2

Author: cieplypolar

apps/typegpu-docs/src/content/docs/fundamentals/utils.mdx

@@ -122,7 +122,7 @@ and submits the resulting `GPUCommandBuffer` to the device.
 
 :::caution
 Read–write operations always flush the command encoder.
-When you call a pipeline with a performance callback, the callback is invoked at the end of the batch.
+When you call a pipeline with a performance callback, the callback is invoked at the end of the batch. The timestamps themselves are not affected by the batching. They are still written at the beginning and/or end of the associated pipeline/render pass.
 We've prepared a table showing when a flush occurs (i.e., when a new command encoder is created). Keep this in mind when using `batch`.
 :::
 

packages/typegpu/src/core/pipeline/computePipeline.ts

@@ -195,27 +195,18 @@ class TgpuComputePipelineImpl implements TgpuComputePipeline {
     pass.dispatchWorkgroups(x, y, z);
     pass.end();
 
-    if (
-      this._priors.performanceCallback &&
-      branch[$internal].batchState.ongoingBatch
-    ) {
+    const hasPerformanceCallback = !!this._priors.performanceCallback;
+    const isOngoingBatch = branch[$internal].batchState.ongoingBatch;
+
+    if (hasPerformanceCallback && isOngoingBatch) {
       branch[$internal].batchState.performanceCallbacks.push(() =>
         triggerPerformanceCallback({ root: branch, priors: this._priors })
       );
-    } else if (
-      this._priors.performanceCallback &&
-      !branch[$internal].batchState.ongoingBatch
-    ) {
-      branch[$internal].flush();
-      triggerPerformanceCallback({
-        root: branch,
-        priors: this._priors,
-      });
-    } else if (
-      !branch[$internal].batchState.ongoingBatch &&
-      !this._priors.performanceCallback
-    ) {
+    } else if (!isOngoingBatch) {
       branch[$internal].flush();
+      if (hasPerformanceCallback) {
+        triggerPerformanceCallback({ root: branch, priors: this._priors });
+      }
     }
   }
 

packages/typegpu/src/core/pipeline/renderPipeline.ts

@@ -566,27 +566,18 @@ class TgpuRenderPipelineImpl implements TgpuRenderPipeline {
 
     pass.end();
 
-    if (
-      internals.priors.performanceCallback &&
-      branch[$internal].batchState.ongoingBatch
-    ) {
+    const hasPerformanceCallback = !!internals.priors.performanceCallback;
+    const isOngoingBatch = branch[$internal].batchState.ongoingBatch;
+
+    if (hasPerformanceCallback && isOngoingBatch) {
       branch[$internal].batchState.performanceCallbacks.push(() =>
         triggerPerformanceCallback({ root: branch, priors: internals.priors })
       );
-    } else if (
-      internals.priors.performanceCallback &&
-      !branch[$internal].batchState.ongoingBatch
-    ) {
-      branch[$internal].flush();
-      triggerPerformanceCallback({
-        root: branch,
-        priors: internals.priors,
-      });
-    } else if (
-      !branch[$internal].batchState.ongoingBatch &&
-      !internals.priors.performanceCallback
-    ) {
+    } else if (!isOngoingBatch) {
       branch[$internal].flush();
+      if (hasPerformanceCallback) {
+        triggerPerformanceCallback({ root: branch, priors: internals.priors });
+      }
     }
   }
 

packages/typegpu/src/core/pipeline/timeable.ts

@@ -159,8 +159,7 @@ export function triggerPerformanceCallback({
     0,
   );
 
-  (async () => {
-    const result = await querySet.read();
+  querySet.read().then((result) => {
     const start =
       result[priors.timestampWrites?.beginningOfPassWriteIndex ?? 0];
     const end = result[priors.timestampWrites?.endOfPassWriteIndex ?? 1];
@@ -169,6 +168,6 @@ export function triggerPerformanceCallback({
       throw new Error('QuerySet did not return valid timestamps.');
     }
 
-    await callback(start, end);
-  })();
+    callback(start, end);
+  });
 }

packages/typegpu/src/core/root/init.ts

@@ -298,9 +298,7 @@ class TgpuRootImpl extends WithBindingImpl
       },
 
       get commandEncoder() {
-        if (!commandEncoder) {
-          commandEncoder = device.createCommandEncoder();
-        }
+        commandEncoder ??= device.createCommandEncoder();
 
         return commandEncoder;
       },
@@ -317,25 +315,25 @@ class TgpuRootImpl extends WithBindingImpl
   }
 
   batch(callback: () => void) {
-    const nestedBatch = this[$internal].batchState.ongoingBatch;
-    if (nestedBatch) {
+    const { batchState } = this[$internal];
+
+    if (batchState.ongoingBatch) {
       throw new Error('Nested batch is not allowed');
     }
 
-    this[$internal].batchState.ongoingBatch = true;
+    batchState.ongoingBatch = true;
 
     try {
       callback();
     } finally {
       this[$internal].flush();
-      for (
-        const performanceCallback of this[$internal].batchState
-          .performanceCallbacks
-      ) {
+
+      for (const performanceCallback of batchState.performanceCallbacks) {
         performanceCallback();
       }
-      this[$internal].batchState.ongoingBatch = false;
-      this[$internal].batchState.performanceCallbacks = [];
+
+      batchState.ongoingBatch = false;
+      batchState.performanceCallbacks = [];
     }
   }