@forgeax/engine-rhi-debug 0.1.28 → 0.1.30

package/src/types.ts

@@ -2,9 +2,8 @@
 //
 // Shape:
 // - RhiCallEvent: closed union (~40 kind incl. initialData + frameMark), each kind name 1:1 with RHI method name.
-//   The ForgeaX encodeEmptyComputePass compound operation is represented by
-//   its existing beginComputePass/endComputePass event pair.
-//   Excludes: resolveQuerySet (per OOS-3).
+//   Query-set lifecycle and occlusion resolve calls are ordinary events;
+//   timestamp writes and render-bundle execution remain deferred.
 //   Includes: core RHI + copyExternalImageToTexture + clearBuffer (per IS-11).
 // - Tape: header with formatVersion, rhiCapsRecorded, events array, blobPool map.
 // - InspectReport: frameIdx, workIndex, bindings, drawCall, rt (path string, not inline base64).
@@ -100,6 +99,17 @@ export interface RhiCallEventDestroyTexture {
   readonly handleId: HandleId;
 }
 
+export interface RhiCallEventCreateQuerySet {
+  readonly kind: 'createQuerySet';
+  readonly handleId: HandleId;
+  readonly desc: Pick<GPUQuerySetDescriptor, 'label' | 'type' | 'count'>;
+}
+
+export interface RhiCallEventDestroyQuerySet {
+  readonly kind: 'destroyQuerySet';
+  readonly handleId: HandleId;
+}
+
 export interface RhiCallEventCreateTextureView {
   readonly kind: 'createTextureView';
   readonly sourceHandleId: HandleId;
@@ -122,6 +132,13 @@ export interface RhiCallEventCreateSampler {
   readonly desc?: Partial<GPUSamplerDescriptor> | undefined;
 }
 
+export interface RhiCallEventGetBindGroupLayout {
+  readonly kind: 'getBindGroupLayout';
+  readonly handleId: HandleId;
+  readonly pipelineHandleId: HandleId;
+  readonly index: number;
+}
+
 export interface RhiCallEventCreateBindGroupLayout {
   readonly kind: 'createBindGroupLayout';
   readonly handleId: HandleId;
@@ -289,8 +306,8 @@ export interface RhiCallEventBeginRenderPass {
           readonly [key: string]: unknown;
         }
       | undefined;
-    readonly occlusionQuerySet?: unknown | undefined;
-    readonly timestampWrites?: unknown | undefined;
+    /** The opaque query set is represented by the parallel handle id below. */
+    readonly timestampWrites?: Omit<GPURenderPassTimestampWrites, 'querySet'> | undefined;
     readonly maxDrawCount?: number | undefined;
   };
   readonly colorAttachmentViewHandleIds: readonly (HandleId | undefined)[];
@@ -301,13 +318,20 @@ export interface RhiCallEventBeginRenderPass {
    */
   readonly colorAttachmentResolveTargetHandleIds?: readonly (HandleId | undefined)[];
   readonly depthStencilViewHandleId?: HandleId | undefined;
+  readonly occlusionQuerySetHandleId?: HandleId | undefined;
+  readonly timestampQuerySetHandleId?: HandleId | undefined;
 }
 
 export interface RhiCallEventBeginComputePass {
   readonly kind: 'beginComputePass';
+  readonly timestampQuerySetHandleId?: HandleId | undefined;
   readonly cmdHandleId: HandleId;
   readonly passHandleId: HandleId;
-  readonly desc?: Partial<GPUComputePassDescriptor> | undefined;
+  readonly desc?:
+    | (Omit<Partial<GPUComputePassDescriptor>, 'timestampWrites'> & {
+        readonly timestampWrites?: Omit<GPUComputePassTimestampWrites, 'querySet'> | undefined;
+      })
+    | undefined;
 }
 
 export interface RhiCallEventCopyBufferToBuffer {
@@ -362,6 +386,16 @@ export interface RhiCallEventClearBuffer {
   readonly size?: number | undefined;
 }
 
+export interface RhiCallEventResolveQuerySet {
+  readonly kind: 'resolveQuerySet';
+  readonly cmdHandleId: HandleId;
+  readonly querySetHandleId: HandleId;
+  readonly firstQuery: number;
+  readonly queryCount: number;
+  readonly destinationHandleId: HandleId;
+  readonly destinationOffset: number;
+}
+
 export interface RhiCallEventPushDebugGroup {
   readonly kind: 'pushDebugGroup';
   readonly cmdHandleId: HandleId;
@@ -468,6 +502,17 @@ export interface RhiCallEventEndRenderPass {
   readonly passHandleId: HandleId;
 }
 
+export interface RhiCallEventBeginOcclusionQuery {
+  readonly kind: 'beginOcclusionQuery';
+  readonly passHandleId: HandleId;
+  readonly queryIndex: number;
+}
+
+export interface RhiCallEventEndOcclusionQuery {
+  readonly kind: 'endOcclusionQuery';
+  readonly passHandleId: HandleId;
+}
+
 export interface RhiCallEventSetBlendConstant {
   readonly kind: 'setBlendConstant';
   readonly passHandleId: HandleId;
@@ -555,8 +600,9 @@ export interface RhiCallEventInitialData {
  * Closed union of all recordable RHI call events.
  *
  * v1 covers: core RHI methods + copyExternalImageToTexture + clearBuffer (IS-11).
- * Excludes: resolveQuerySet (OOS-3),
- *           executeBundles (OOS-10), beginOcclusionQuery/endOcclusionQuery.
+ * Timestamp writes and render-bundle execution remain deferred; query-set
+ * lifecycle, resolve, and occlusion-query events are represented as ordinary
+ * events.
  *
  * Kinds are named 1:1 with RHI method names per plan-strategy §8 naming convention.
  * The frameMark kind is the only non-method event — it marks frame boundaries.
@@ -567,9 +613,12 @@ export type RhiCallEvent =
   | RhiCallEventCreateTexture
   | RhiCallEventDestroyBuffer
   | RhiCallEventDestroyTexture
+  | RhiCallEventCreateQuerySet
+  | RhiCallEventDestroyQuerySet
   | RhiCallEventCreateTextureView
   | RhiCallEventCreateSampler
   | RhiCallEventCreateBindGroupLayout
+  | RhiCallEventGetBindGroupLayout
   | RhiCallEventCreateBindGroup
   | RhiCallEventCreatePipelineLayout
   | RhiCallEventCreateRenderPipeline
@@ -587,6 +636,7 @@ export type RhiCallEvent =
   | RhiCallEventCopyTextureToBuffer
   | RhiCallEventCopyTextureToTexture
   | RhiCallEventClearBuffer
+  | RhiCallEventResolveQuerySet
   | RhiCallEventPushDebugGroup
   | RhiCallEventPopDebugGroup
   | RhiCallEventInsertDebugMarker
@@ -601,6 +651,8 @@ export type RhiCallEvent =
   | RhiCallEventSetScissorRect
   | RhiCallEventSetStencilReference
   | RhiCallEventEndRenderPass
+  | RhiCallEventBeginOcclusionQuery
+  | RhiCallEventEndOcclusionQuery
   | RhiCallEventSetBlendConstant
   | RhiCallEventDrawIndirect
   | RhiCallEventDrawIndexedIndirect
@@ -881,9 +933,4 @@ export type InspectFields = 'bindings' | 'drawCall' | 'rt';
  *
  * @internal
  */
-export const DEFERRED_COMMANDS = new Set<string>([
-  'beginOcclusionQuery',
-  'endOcclusionQuery',
-  'executeBundles',
-  'resolveQuerySet',
-]);
+export const DEFERRED_COMMANDS = new Set<string>(['executeBundles', 'writeTimestamp']);