@forgeax/engine-render 0.1.27 → 0.1.29

package/src/record/main-pass-geometry.ts

@@ -10,7 +10,9 @@ import {
   RhiError,
   type RhiRenderPassEncoder,
 } from '@forgeax/engine-rhi';
+import { STANDARD_TEXTURE_MASK_OVERRIDE } from '@forgeax/engine-shader';
 import type { ParamSchemaEntry, PassKind, PrimitiveTopology } from '@forgeax/engine-types';
+import { gpuDrivenDrawKey, gpuDrivenSourceDrawItemIndex } from '../extract/gpu-driven';
 import { GpuBuffer } from '../gpu-resource';
 import {
   GPU_BUFFER_USAGE_COPY_DST,
@@ -19,11 +21,7 @@ import {
 } from '../gpu-usage';
 import { createHdrpSkinUnifiedBindGroup, getOrCreateHdrpBuffers } from '../hdrp-buffers';
 import type { InstanceBufferCacheEntry } from '../instance-buffer-cache';
-import {
-  type InstanceCollectionFailureCode,
-  recordInstanceFailure,
-  recordInstanceResidency,
-} from '../instances';
+import { type InstanceCollectionFailureCode, instanceUploadRangesForResident } from '../instances';
 import { SPRITE_PREMULTIPLIED_ALPHA_BLEND } from '../materials';
 import {
   createPbrSkinMeshBindGroupEntries,
@@ -127,6 +125,7 @@ type MaterialPipelineLookup = {
   readonly sampleCount: number;
   readonly colorFormatOverride: GPUTextureFormat | undefined;
   readonly additionalColorFormats: readonly GPUTextureFormat[] | undefined;
+  readonly textureMask: number | undefined;
   readonly handle: MaterialShaderPipelineEntry | null;
 };
 
@@ -134,6 +133,67 @@ type GeometryRecordProfileSegment = 'material-bind-groups' | 'pipeline-selection
 
 type GeometryRenderState = ReturnType<typeof geometryRenderStateForTopology>;
 
+function gpuDrivenDrawIndicesBySubmesh(
+  source: RenderableSnapshot,
+  mesh: _InternalRenderPipelineContext['validatedOrdered'][number]['mesh'],
+): ReadonlyMap<number, number> {
+  const draws = source.gpuDrivenDraws;
+  if (draws === undefined || draws.length === 0) return new Map();
+  const indices = new Map<number, number>();
+  let hasStableSourceIdentity = false;
+  for (const [compactIndex, draw] of draws.entries()) {
+    const drawItemIndex = draw.drawItemIndex;
+    if (drawItemIndex === undefined) continue;
+    hasStableSourceIdentity = true;
+    if (mesh.submeshes[drawItemIndex] !== undefined) indices.set(drawItemIndex, compactIndex);
+  }
+  if (hasStableSourceIdentity) return indices;
+
+  // Legacy snapshots predating drawItemIndex are matched by their compact
+  // geometry facts. New extracted snapshots never take this path.
+  let nonIndexedFirst = 0;
+  let drawCursor = 0;
+  for (const [submeshIndex, submesh] of mesh.submeshes.entries()) {
+    const first = mesh.indexed ? submesh.indexOffset : nonIndexedFirst;
+    const count = mesh.indexed ? submesh.indexCount : submesh.vertexCount;
+    if (!mesh.indexed) nonIndexedFirst += submesh.vertexCount;
+    const draw = draws[drawCursor];
+    if (
+      draw !== undefined &&
+      draw.first === first &&
+      draw.count === count &&
+      draw.materialSlot === submesh.materialSlot &&
+      draw.topology === submesh.topology
+    ) {
+      indices.set(submeshIndex, drawCursor);
+      drawCursor += 1;
+    }
+  }
+  return indices;
+}
+
+function isGpuDrivenMainClaimedSubmesh(
+  c: _InternalRenderPipelineContext,
+  source: RenderableSnapshot,
+  submeshIndex: number,
+  drawIndices: ReadonlyMap<number, number>,
+): boolean {
+  const drawItemIndex = drawIndices.get(submeshIndex);
+  const draw = drawItemIndex === undefined ? undefined : source.gpuDrivenDraws?.[drawItemIndex];
+  if (drawItemIndex === undefined || draw === undefined) return false;
+  const material = source.materials[draw.materialSlot] ?? source.material;
+  const sourceDrawItemIndex = gpuDrivenSourceDrawItemIndex(draw, drawItemIndex);
+  return (
+    c.gpuDrivenDrawKeys?.has(
+      gpuDrivenDrawKey(
+        worldEntityKey(source.worldId, source.entityKey),
+        material.materialHandle ?? -1,
+        sourceDrawItemIndex,
+      ),
+    ) === true
+  );
+}
+
 /**
  * Select the transmission shader axis from authored material data, not the
  * canonical boot schema.  The latter reserves transmission fields for the
@@ -252,8 +312,8 @@ export function effectiveMaterialLayoutIdentity(
 /**
  * Resolve the depth contract for a geometry pass without changing the base
  * material state. Temporal scene-data shares the main pass depth attachment:
- * it is read-only and accepts the equal depth produced by the unjittered
- * temporal projection, while still rejecting fragments behind the visible
+ * it is read-only and accepts the equal depth produced by the shared raster
+ * projection, while motion varyings remain unjittered. It rejects fragments behind the visible
  * surface.
  */
 export function geometryRenderStateForPass(
@@ -297,6 +357,7 @@ function submitSubmeshDraws(
   indexCount: number,
   vertexCount: number,
   indexOffset: number,
+  onDraw?: () => void,
 ): void {
   if (state.pipeline !== pipeline) {
     pass.setPipeline(pipeline);
@@ -320,6 +381,7 @@ function submitSubmeshDraws(
     } else {
       pass.draw(vertexCount, instanceDraw.instanceCount, 0, 0);
     }
+    onDraw?.();
   }
 }
 
@@ -371,6 +433,7 @@ export function recordGeometryDraws(
   ) => BindGroup,
   passKind: PassKind = 'forward',
   selectedDispatch?: readonly DispatchEntry[],
+  colorFormats: readonly GPUTextureFormat[] = [],
 ): void {
   const {
     runtime,
@@ -455,6 +518,7 @@ export function recordGeometryDraws(
     layoutProjection: import('@forgeax/engine-geometry').VertexLayoutProjection,
     vertexEntry?: string,
     fragmentEntry?: string,
+    textureMask?: number,
   ): MaterialShaderPipelineEntry | null => {
     // The fallback MRT is an extension of the built-in Standard PBR output
     // contract only.  The render pass may carry a second attachment whenever
@@ -467,7 +531,9 @@ export function recordGeometryDraws(
     const reflectionFallbackFormats =
       materialShaderId === 'forgeax::default-standard-pbr' &&
       c.reflectionFallbackColorFormat !== undefined
-        ? [c.reflectionFallbackColorFormat]
+        ? passKind === 'deferred'
+          ? colorFormats.slice(1)
+          : [c.reflectionFallbackColorFormat]
         : undefined;
     const renderStateKey = renderStateHash(renderState);
     const shaderLookupCache = materialPipelineLookupCache.get(materialShaderId);
@@ -482,6 +548,7 @@ export function recordGeometryDraws(
           cached.variantSet === variantSet &&
           cached.vertexEntry === vertexEntry &&
           cached.fragmentEntry === fragmentEntry &&
+          cached.textureMask === textureMask &&
           cached.passKind === passKind &&
           cached.layoutProjection.digest === layoutProjection.digest &&
           cached.sampleCount === sampleCount &&
@@ -528,9 +595,12 @@ export function recordGeometryDraws(
         layoutProjection,
         undefined,
         undefined,
+        undefined,
         reflectionFallbackFormats,
         vertexEntry,
         fragmentEntry,
+        undefined,
+        textureMask === undefined ? undefined : { [STANDARD_TEXTURE_MASK_OVERRIDE]: textureMask },
       ) ?? null;
     const handle =
       profilePhase === undefined
@@ -558,6 +628,7 @@ export function recordGeometryDraws(
         sampleCount,
         colorFormatOverride: colorFormat,
         additionalColorFormats: reflectionFallbackFormats,
+        textureMask,
         handle,
       };
       if (shaderLookupCache === undefined) {
@@ -577,7 +648,6 @@ export function recordGeometryDraws(
   for (let i = 0; i < validatedOrdered.length; i++) {
     const entry = validatedOrdered[i];
     if (entry === undefined) continue;
-
     // Points/Lines share the Standard geometry pass. Their retained source
     // is prepared once by the renderer owner, while this loop remains the
     // sole pass/draw submission owner and preserves the authored topology.
@@ -585,18 +655,6 @@ export function recordGeometryDraws(
     if (entry.source.pointsLines !== undefined && pointsLinesSubmission?.plan.drawCount !== 1)
       continue;
 
-    if (
-      passKind === 'forward' &&
-      c.gpuDrivenEntityKeys.has(
-        worldEntityKey(
-          c.gpuDrivenWorldKeys?.[entry.source.worldId] ?? entry.source.worldId,
-          entry.source.entityKey,
-        ),
-      )
-    ) {
-      continue;
-    }
-
     // feat-20260609 M2: skip entities that don't match the pass selector.
     if (matchedMaterials !== null && !matchedMaterials.has(entry.renderableIndex)) continue;
 
@@ -691,6 +749,7 @@ export function recordGeometryDraws(
         resolveGeometryInstancesBindGroup(c, identityInstanceBuffer, undefined);
       pass.setBindGroup(3, pointsLinesInstancesBg);
       recordOcclusionCandidate(() => recordPointsLinesDraw(pass, pointsLinesSubmission.plan));
+      c.onRenderableDraw?.(entry);
       pass.setBindGroup(0, viewBindGroup as BindGroup, [viewBindGroupDynamicOffset, 0]);
       continue;
     }
@@ -984,6 +1043,7 @@ export function recordGeometryDraws(
     // — the same placeholders the unlit path already used. The generic
     // branch below builds the per-submesh BG.
     let perSubmeshBg: BindGroup | null = null;
+    const gpuDrivenDrawIndices = gpuDrivenDrawIndicesBySubmesh(entry.source, entry.mesh);
     // feat-20260608 M4 / w16: per-submesh pipeline selection + draw loop.
     // Each submesh carries its own topology, so pipeline selection is per-submesh.
     // Vertex/index buffers and bind groups are set once (shared across all submeshes).
@@ -1001,12 +1061,22 @@ export function recordGeometryDraws(
         const materialHandle = submeshMaterial.materialHandle ?? 0;
         if (materialHandles === undefined || !materialHandles.has(materialHandle)) continue;
       }
+      if (
+        passKind === 'forward' &&
+        isGpuDrivenMainClaimedSubmesh(c, entry.source, smIdx, gpuDrivenDrawIndices)
+      ) {
+        continue;
+      }
       const draws: readonly (DispatchEntry | undefined)[] =
         selectedDispatch === undefined
           ? [undefined]
           : (materialPasses.get(entry.renderableIndex)?.get(submeshMaterial.materialHandle ?? 0) ??
             []);
       for (const selectedPass of draws) {
+        // Temporal projects the selected material's alpha/motion contract,
+        // not its authored Forward entry points or color outputs.
+        const vertexEntry = passKind === 'temporal' ? undefined : selectedPass?.vertexEntry;
+        const fragmentEntry = passKind === 'temporal' ? undefined : selectedPass?.fragmentEntry;
         const selectedShaderId =
           selectedPass === undefined
             ? submeshMaterial.materialShaderId
@@ -1154,8 +1224,9 @@ export function recordGeometryDraws(
             unlitVariantSet,
             colorFormatOverride,
             entry.mesh.layoutProjection,
-            selectedPass?.vertexEntry,
-            selectedPass?.fragmentEntry,
+            vertexEntry,
+            fragmentEntry,
+            submeshMaterial.standardTextureMask,
           );
           materialPipelineEntry = unlitRsp;
           smPipelineHandle =
@@ -1195,7 +1266,7 @@ export function recordGeometryDraws(
           const transmissionAvailable = requestsStandardTransmissionVariant(submeshMaterial);
           const materialCapabilityVariantSet =
             transmissionAvailable && !capabilityVariantSet.includes('TRANSMISSION_AVAILABLE=')
-              ? `${capabilityVariantSet === '' ? '' : `${capabilityVariantSet}+`}TRANSMISSION_AVAILABLE=true`
+              ? `${capabilityVariantSet}+TRANSMISSION_AVAILABLE=true`
               : capabilityVariantSet;
           // Sprite's base request must retain the boot-selected artifact. Only
           // SpriteInstances uses the explicit empty key for the
@@ -1208,9 +1279,7 @@ export function recordGeometryDraws(
               : undefined
             : entry.variantSet === undefined
               ? materialCapabilityVariantSet
-              : capabilityVariantSet === ''
-                ? entry.variantSet
-                : `${capabilityVariantSet}+${entry.variantSet}`;
+              : `${materialCapabilityVariantSet}+${entry.variantSet}`;
           const cachedPipeline = resolveMaterialPipeline(
             smMaterialShaderId,
             pipelineRenderState,
@@ -1219,8 +1288,9 @@ export function recordGeometryDraws(
             variantSet,
             colorFormatOverride,
             entry.mesh.layoutProjection,
-            selectedPass?.vertexEntry,
-            selectedPass?.fragmentEntry,
+            vertexEntry,
+            fragmentEntry,
+            submeshMaterial.standardTextureMask,
           );
           // feat-20260615-pipeline-spec-ssot M6-T1: cache miss resolves to
           // null uniformly across URP / HDRP / skin shaders. Charter P3
@@ -1320,6 +1390,7 @@ export function recordGeometryDraws(
               sm.indexCount,
               sm.vertexCount,
               sm.indexOffset,
+              () => c.onRenderableDraw?.(entry),
             ),
           );
         } else {
@@ -1334,6 +1405,7 @@ export function recordGeometryDraws(
                 sm.indexCount,
                 sm.vertexCount,
                 sm.indexOffset,
+                () => c.onRenderableDraw?.(entry),
               ),
             ),
           );
@@ -1352,10 +1424,7 @@ export function recordGeometryDraws(
  * @internal
  */
 function uploadInstanceRanges(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+  c: _InternalRenderPipelineContext,
   inst: NonNullable<RenderableSnapshot['instances']>,
   buffer: Buffer,
   ranges: readonly { readonly start: number; readonly end: number }[],
@@ -1387,10 +1456,7 @@ function uploadInstanceRanges(
 }
 
 export function reportInstanceResidency(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+  c: _InternalRenderPipelineContext,
   inst: NonNullable<RenderableSnapshot['instances']>,
   input: {
     readonly lane: 'direct-storage' | 'chunked-storage' | 'direct-uniform' | 'chunked-uniform';
@@ -1400,8 +1466,8 @@ export function reportInstanceResidency(
     readonly uploadedBytes: number;
   },
 ): void {
-  if (inst.collectionId === undefined || c.frameState.instanceResidency === undefined) return;
-  recordInstanceResidency(c.frameState.instanceResidency, {
+  if (inst.collectionId === undefined) return;
+  c.frameState.instanceCollections?._reportResidency({
     collectionId: inst.collectionId,
     frameNumber: c.frameState.frameNumber,
     residentGeneration: c.runtime.deviceScope.generation,
@@ -1415,10 +1481,7 @@ export function reportInstanceResidency(
 }
 
 function reportInstanceFailure(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+  c: _InternalRenderPipelineContext,
   inst: NonNullable<RenderableSnapshot['instances']>,
   error: {
     readonly code: InstanceCollectionFailureCode;
@@ -1428,8 +1491,8 @@ function reportInstanceFailure(
   requestedBytes: number,
   supportedBytes: number | undefined,
 ): void {
-  if (inst.collectionId === undefined || c.frameState.instanceResidency === undefined) return;
-  recordInstanceFailure(c.frameState.instanceResidency, {
+  if (inst.collectionId === undefined) return;
+  c.frameState.instanceCollections?._reportFailure({
     collectionId: inst.collectionId,
     code: error.code,
     expected: error.expected,
@@ -1445,13 +1508,7 @@ function reportInstanceFailure(
   });
 }
 
-function clearInstanceChunksForOwner(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
-  ownerKey: number,
-): void {
+function clearInstanceChunksForOwner(c: _InternalRenderPipelineContext, ownerKey: number): void {
   const chunks = c.frameState.instanceBufferChunks;
   if (chunks === undefined) return;
   const prefix = `${ownerKey}:`;
@@ -1466,10 +1523,7 @@ function clearInstanceChunksForOwner(
 }
 
 export function resolveStorageInstanceChunks(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+  c: _InternalRenderPipelineContext,
   entry: _InternalRenderPipelineContext['validatedOrdered'][number],
   inst: NonNullable<RenderableSnapshot['instances']>,
   cap: number,
@@ -1507,6 +1561,7 @@ export function resolveStorageInstanceChunks(
   const draws: GeometryInstanceDraw[] = [];
   const uploadedRanges: { start: number; end: number }[] = [];
   let uploadedBytes = 0;
+  const dirtyRanges = inst.dirtyRanges ?? [{ start: 0, end: inst.instanceCount } as const];
   for (let start = 0; start < inst.instanceCount; start += chunkCapacity) {
     const end = Math.min(inst.instanceCount, start + chunkCapacity);
     const count = end - start;
@@ -1548,14 +1603,17 @@ export function resolveStorageInstanceChunks(
       if (chunks === undefined) frameState.transientInstanceBuffers.push(active);
     }
     if (active === undefined) return null;
-    const needsUpload =
-      activeIsNew || active.uploadedRevision !== (inst.revision ?? inst.archVersion);
-    const rangesToUpload = [
-      {
-        start: 0,
-        end: count,
-      },
-    ];
+    const localRanges = dirtyRanges
+      .map((range) => ({
+        start: Math.max(start, range.start) - start,
+        end: Math.min(end, range.end) - start,
+      }))
+      .filter((range) => range.end > range.start);
+    const needsUpload = activeIsNew || active.uploadedRevision !== inst.revision;
+    const rangesToUpload = instanceUploadRangesForResident(activeIsNew, localRanges, {
+      start: 0,
+      end: count,
+    });
     if (needsUpload && rangesToUpload.length > 0) {
       const upload = uploadInstanceRanges(
         c,
@@ -1575,8 +1633,7 @@ export function resolveStorageInstanceChunks(
           inst,
           {
             code: 'queue-write-buffer-failed',
-            expected:
-              'the renderer-owned instance storage buffer accepts the complete instance payload',
+            expected: 'the renderer-owned instance storage buffer accepts the dirty range',
             hint: 'retry after the active device is healthy or recover the renderer',
           },
           inst.instanceCount * strideBytes,
@@ -1586,8 +1643,8 @@ export function resolveStorageInstanceChunks(
       }
     }
     if (needsUpload) {
-      {
-        const published = { ...active, uploadedRevision: inst.revision ?? inst.archVersion };
+      if (inst.revision !== undefined) {
+        const published = { ...active, uploadedRevision: inst.revision };
         active = published;
         chunks?.set(chunkKey, published);
       }
@@ -1625,11 +1682,8 @@ export function resolveStorageInstanceChunks(
   return draws;
 }
 
-export function resolveGeometryInstanceBuffer(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+function resolveGeometryInstanceBuffer(
+  c: _InternalRenderPipelineContext,
   entry: _InternalRenderPipelineContext['validatedOrdered'][number],
   identityInstanceDraws: readonly GeometryInstanceDraw[],
   useProbeBlend: boolean,
@@ -1665,9 +1719,12 @@ export function resolveGeometryInstanceBuffer(
   // the shared identity buffer, which would silently render one instance.
   if (inst.instanceCount === 0) return [];
   const entityCacheKey = instanceCollectionCacheKey(entry.source.worldId, inst);
-  const revision = inst.revision ?? inst.archVersion;
+  const revision = inst.revision;
+  const dirtyRanges = inst.dirtyRanges;
   const sameRevision = (cached: InstanceBufferCacheEntry): boolean =>
-    cached.uploadedRevision === revision;
+    revision === undefined
+      ? cached.uploadedRevision === undefined
+      : cached.uploadedRevision === revision;
   const fullRange = [{ start: 0, end: inst.instanceCount }] as const;
   let instanceBuffer: Buffer = pipelineState.identityInstanceBuffer;
   let instanceCount = 1;
@@ -1685,6 +1742,7 @@ export function resolveGeometryInstanceBuffer(
       const activeKeys = new Set<string>();
       const draws: GeometryInstanceDraw[] = [];
       const uniformStrideBytes = 16 * Float32Array.BYTES_PER_ELEMENT;
+      const dirty = inst.dirtyRanges ?? fullRange;
       const uploadedRanges: { start: number; end: number }[] = [];
       let uploadedBytes = 0;
       for (let start = 0; start < inst.instanceCount; start += MAX_UNIFORM_INSTANCES) {
@@ -1730,13 +1788,17 @@ export function resolveGeometryInstanceBuffer(
           chunks?.set(chunkKey, active);
           if (chunks === undefined) frameState.transientInstanceBuffers.push(active);
         }
+        const localRanges = dirty
+          .map((range) => ({
+            start: Math.max(start, range.start) - start,
+            end: Math.min(start + count, range.end) - start,
+          }))
+          .filter((range) => range.end > range.start);
         const needsUpload = activeIsNew || !sameRevision(active);
-        const rangesToUpload = [
-          {
-            start: 0,
-            end: count,
-          },
-        ];
+        const rangesToUpload = instanceUploadRangesForResident(activeIsNew, localRanges, {
+          start: 0,
+          end: count,
+        });
         if (needsUpload && rangesToUpload.length > 0) {
           const upload = uploadInstanceRanges(
             c,
@@ -1756,8 +1818,7 @@ export function resolveGeometryInstanceBuffer(
               inst,
               {
                 code: 'queue-write-buffer-failed',
-                expected:
-                  'the renderer-owned instance uniform buffer accepts the complete instance payload',
+                expected: 'the renderer-owned instance uniform buffer accepts the dirty range',
                 hint: 'retry after the active device is healthy or recover the renderer',
               },
               inst.instanceCount * uniformStrideBytes,
@@ -1767,7 +1828,8 @@ export function resolveGeometryInstanceBuffer(
           }
         }
         if (needsUpload) {
-          const published = { ...active, uploadedRevision: revision };
+          const published =
+            revision === undefined ? active : { ...active, uploadedRevision: revision };
           active = published;
           chunks?.set(chunkKey, published);
         }
@@ -1848,7 +1910,6 @@ export function resolveGeometryInstanceBuffer(
           if (!bufRes.ok) {
             runtime.errorRegistry.fire(bufRes.error);
             reportInstanceFailure(c, inst, bufRes.error, requestedBytes, cap);
-            return null;
           } else {
             // feat-20260619 M4 / F12: destroy the old cached buffer
             // before replacing it with the new one (D-6).
@@ -1871,7 +1932,11 @@ export function resolveGeometryInstanceBuffer(
         }
         if (active !== null) {
           const needsUpload = activeIsNew || !sameRevision(active);
-          const ranges = [fullRange[0]];
+          const ranges = instanceUploadRangesForResident(
+            activeIsNew,
+            dirtyRanges ?? fullRange,
+            fullRange[0],
+          );
           let uploadRanges: readonly { readonly start: number; readonly end: number }[] = [];
           let uploadedBytes = 0;
           if (needsUpload && ranges.length > 0) {
@@ -1890,8 +1955,7 @@ export function resolveGeometryInstanceBuffer(
                 inst,
                 {
                   code: 'queue-write-buffer-failed',
-                  expected:
-                    'the renderer-owned instance buffer accepts the complete instance payloads',
+                  expected: 'the renderer-owned instance buffer accepts the dirty ranges',
                   hint: 'retry after the active device is healthy or recover the renderer',
                 },
                 requestedBytes,
@@ -1905,7 +1969,8 @@ export function resolveGeometryInstanceBuffer(
             }
           }
           if (needsUpload) {
-            const published = { ...active, uploadedRevision: revision };
+            const published =
+              revision === undefined ? active : { ...active, uploadedRevision: revision };
             frameState.instanceBuffers.set(entityCacheKey, published);
             active = published;
           }
@@ -1940,10 +2005,7 @@ export function resolveGeometryInstanceBuffer(
 }
 
 export function resolveProbeBlendBuffer(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+  c: _InternalRenderPipelineContext,
   record: import('../scene/probe-blend-record').ProbeBlendRecord | undefined,
   entityKey?: number,
 ): { readonly buffer: Buffer; readonly offset: number } {
@@ -1991,10 +2053,7 @@ export function resolveProbeBlendBuffer(
 }
 
 export function resolveGeometryInstancesBindGroup(
-  c: Pick<
-    _InternalRenderPipelineContext,
-    'runtime' | 'pipelineState' | 'frameState' | 'bindGroupCounts'
-  >,
+  c: _InternalRenderPipelineContext,
   instanceBuffer: Buffer,
   probeBuffer?: Buffer,
 ): BindGroup {
@@ -2004,8 +2063,13 @@ export function resolveGeometryInstancesBindGroup(
       ? pipelineState.instancesBindGroupLayout
       : pipelineState.probeInstancesBindGroupLayout;
   if (layout === undefined) throw new Error('probe instances bind-group layout is unavailable');
+  // A few record-only fixtures construct a minimal frame state and omit the
+  // shared bind-group cache. Production frames always provide it, but keeping
+  // this resolver total lets those fixtures exercise the same binding path
+  // without weakening the production cache contract.
+  const instancesBgShared = frameState.instancesBgShared ?? new WeakMap<object, unknown>();
   return getOrCreateFromChain(
-    frameState.instancesBgShared,
+    instancesBgShared,
     probeBuffer === undefined ? [layout, instanceBuffer] : [layout, instanceBuffer, probeBuffer],
     probeBuffer === undefined ? 'instances-no-probe' : 'instances-probe',
     () => {