@forgeax/engine-render 0.1.23 → 0.1.24

package/dist/{chunk-HZUPSYW7.mjs → chunk-KZFTK6DO.mjs}

@@ -1,8 +1,8 @@
-import { LifecycleConstructionError, RenderTargetDescriptorInvalidError } from './chunk-QODA5UKU.mjs';
+import { LifecycleConstructionError, RenderTargetDescriptorInvalidError } from './chunk-RR5L4SRS.mjs';
 import { ok, err, derive } from '@forgeax/engine-types';
 import '@forgeax/engine-rhi';
 import { vec3 } from '@forgeax/engine-math';
-import { DEFAULT_STANDARD_PBR_PARAM_SCHEMA } from '@forgeax/engine-shader';
+import { STANDARD_PIPELINE_PARAM_SCHEMA, standardPhysicalTextureFields } from '@forgeax/engine-shader';
 
 var DeviceResourceRef = class {
   kind;
@@ -22,6 +22,14 @@ var DeviceResourceRef = class {
     return !this.isCurrent(scope);
   }
 };
+function idempotentCleanup(cleanup) {
+  let cleaned = false;
+  return (value) => {
+    if (cleaned) return;
+    cleaned = true;
+    return cleanup(value);
+  };
+}
 var DeviceScope = class _DeviceScope {
   generation;
   owner;
@@ -75,7 +83,7 @@ var DeviceScope = class _DeviceScope {
     const ref = new DeviceResourceRef(kind, this.owner, this.generation, value);
     this.resources.push({
       ref,
-      cleanup
+      cleanup: idempotentCleanup(cleanup)
     });
     return ref;
   }
@@ -95,20 +103,32 @@ var DeviceScope = class _DeviceScope {
   beginRetire() {
     if (this.lifecycleState === "active") this.lifecycleState = "retiring";
   }
+  clearChildren() {
+    for (const child of [...this.children].reverse()) {
+      child.retire();
+    }
+  }
+  detachChild(child) {
+    const index = this.children.indexOf(child);
+    if (index >= 0) this.children.splice(index, 1);
+  }
   retire() {
     if (this.lifecycleState !== "active" && this.lifecycleState !== "retiring") return;
     this.lifecycleState = "retiring";
+    this.clearChildren();
     this._clearResources();
     this.lifecycleState = "retired";
   }
   abandon() {
     if (this.lifecycleState !== "active") return;
     this.lifecycleState = "abandoned";
+    this.clearChildren();
     this._clearResources();
   }
   dispose() {
     if (this.lifecycleState === "disposed") return;
     this.lifecycleState = "disposed";
+    this.clearChildren();
     this._clearResources();
   }
   async replace(generation, resources) {
@@ -124,6 +144,7 @@ var DeviceScope = class _DeviceScope {
       replacement.dispose();
       return transaction.failure("dispose");
     }
+    this.detachChild(replacement);
     this.retire();
     return ok(replacement);
   }
@@ -163,10 +184,10 @@ var LifecycleTransaction = class {
         }
         const value = await spec.create();
         if (!this.scope.isAlive()) {
-          await this.cleanupOne(spec, value, created);
+          await this.cleanupOne(value, created, idempotentCleanup(spec.cleanup));
           return this.failure("dispose");
         }
-        created.push({ spec, value });
+        created.push({ spec, value, cleanup: idempotentCleanup(spec.cleanup) });
       } catch (cause) {
         const cleanupFailures = await this.cleanupCreated(created);
         return this.failure("create", spec.kind, cleanupFailures, cause);
@@ -200,17 +221,17 @@ var LifecycleTransaction = class {
       const item = created[index];
       if (item === void 0) continue;
       try {
-        await item.spec.cleanup(item.value);
+        await item.cleanup(item.value);
       } catch (cause) {
         failures.push({ resourceKind: item.spec.kind, cause });
       }
     }
     return failures;
   }
-  async cleanupOne(spec, value, created) {
+  async cleanupOne(value, created, cleanup) {
     await this.cleanupCreated(created);
     try {
-      await spec.cleanup(value);
+      await cleanup(value);
     } catch {
     }
   }
@@ -279,6 +300,15 @@ function worldEntityKey(worldId, entityKey) {
 var ZERO_CAMERA_CLEAR_FALLBACK = [0, 0, 0, 1];
 var textureIdentities = /* @__PURE__ */ new WeakMap();
 var nextTextureIdentity = 1;
+var opaqueResourceIdentities = /* @__PURE__ */ new WeakMap();
+var nextOpaqueResourceIdentity = 1;
+function getOpaqueResourceIdentity(resource) {
+  const existing = opaqueResourceIdentities.get(resource);
+  if (existing !== void 0) return existing;
+  const identity = nextOpaqueResourceIdentity++;
+  opaqueResourceIdentities.set(resource, identity);
+  return identity;
+}
 function getTextureIdentity(texture) {
   const object = texture;
   const existing = textureIdentities.get(object);
@@ -346,8 +376,14 @@ var BGL_ONLY_SPEC_STUB = Object.freeze({
   geometry: { topology: "triangle-list", vertexLayout: {} },
   renderState: void 0
 });
-function buildPbrMaterialUserRegionEntries(paramSchema = DEFAULT_STANDARD_PBR_PARAM_SCHEMA) {
-  const derived = derive(paramSchema);
+function buildPbrMaterialUserRegionEntries(paramSchema = STANDARD_PIPELINE_PARAM_SCHEMA, excludedTextureFields = []) {
+  const excluded = new Set(excludedTextureFields);
+  for (const field of standardPhysicalTextureFields(paramSchema)) excluded.add(field);
+  const derived = derive(
+    excluded.size === 0 ? paramSchema : paramSchema.filter(
+      (entry) => !excluded.has(entry.name) || !entry.type.startsWith("texture")
+    )
+  );
   const entries = derived.bglEntries.map(
     (entry) => ({
       binding: entry.binding,
@@ -469,6 +505,43 @@ function appendInjection(bgl, kind) {
       ];
   }
 }
+function physicalTextureFields(paramSchema) {
+  return standardPhysicalTextureFields(paramSchema);
+}
+function appendTextureInjection(bgl, fields) {
+  const start = bgl.length;
+  const fieldSet = new Set(fields);
+  return standardPhysicalTextureFields(
+    fields.map((name) => ({ name, type: "texture2d" }))
+  ).flatMap((field, index) => {
+    if (!fieldSet.has(field)) return [];
+    const binding = start + index * 2;
+    return [
+      {
+        binding,
+        visibility: GPU_SHADER_STAGE_FRAGMENT,
+        sampler: { type: "filtering" }
+      },
+      {
+        binding: binding + 1,
+        visibility: GPU_SHADER_STAGE_FRAGMENT,
+        texture: { sampleType: "float", viewDimension: "2d" }
+      }
+    ];
+  });
+}
+function materialBindGroupLayoutIdentity(shaderId, paramSchema) {
+  const descriptor = buildBindGroupLayoutDescriptor(
+    {
+      shader: { id: shaderId, passKind: "forward", variantSet: void 0 },
+      attachments: { colorFormats: [], depthFormat: void 0, sampleCount: 1 }},
+    { kind: "pbr-material-merged", materialParamSchema: paramSchema }
+  );
+  return JSON.stringify({
+    entries: descriptor.entries,
+    physicalTextureFields: physicalTextureFields(paramSchema)
+  });
+}
 function buildPbrViewBglEntries(caps) {
   const entries = [
     {
@@ -672,6 +745,10 @@ function buildPbrPipelineLayouts(device, caps) {
 }
 var SKIN_MATERIAL_SHADER_ID = "forgeax::pbr-skin";
 var SHADOW_CASTER_SHADER_ID = "forgeax::default-shadow-caster";
+var AUTHORED_STANDARD_ID_RE = /::(?:standard|pbr-skin)(?:-|$)/;
+function isStandardPbrSkinMaterialShader(shaderId) {
+  return shaderId === SKIN_MATERIAL_SHADER_ID || shaderId === "forgeax::default-standard-pbr-skin" || shaderId !== void 0 && /::pbr-skin(?:-|$)/.test(shaderId);
+}
 function shadowCasterVariantSet(storageBuffer, skinned) {
   const skinningDisabled = !skinned;
   if (storageBuffer && skinningDisabled) return "";
@@ -690,6 +767,9 @@ function resolvePipelineGroup2Contract(source) {
   return "mesh";
 }
 function isStandardPbrMaterialShader(shaderId) {
+  return shaderId === "forgeax::default-standard-pbr" || shaderId === SKIN_MATERIAL_SHADER_ID || shaderId === "forgeax::default-standard-pbr-skin" || shaderId !== void 0 && AUTHORED_STANDARD_ID_RE.test(shaderId);
+}
+function isCanonicalStandardPbrMaterialShader(shaderId) {
   return shaderId === "forgeax::default-standard-pbr" || shaderId === SKIN_MATERIAL_SHADER_ID || shaderId === "forgeax::default-standard-pbr-skin";
 }
 function buildPbrSkinLayouts(device, caps, pbr) {
@@ -917,9 +997,16 @@ function buildBindGroupLayoutDescriptor(spec, options) {
     }
     case "pbr-material-merged": {
       const resolvedSchema = resolveMaterialParamSchema(spec, options);
-      const userRegion = buildPbrMaterialUserRegionEntries(resolvedSchema);
+      const effectiveSchema = resolvedSchema ?? STANDARD_PIPELINE_PARAM_SCHEMA;
+      const physicalFields = physicalTextureFields(effectiveSchema);
+      const userRegionSchema = isCanonicalStandardPbrMaterialShader(spec.shader.id) ? STANDARD_PIPELINE_PARAM_SCHEMA : effectiveSchema;
+      const userRegion = buildPbrMaterialUserRegionEntries(userRegionSchema);
       const afterIbl = [...userRegion, ...appendInjection(userRegion, "ibl")];
-      const merged = [...afterIbl, ...appendInjection(afterIbl, "transmission")];
+      const afterTransmission = [...afterIbl, ...appendInjection(afterIbl, "transmission")];
+      const merged = [
+        ...afterTransmission,
+        ...appendTextureInjection(afterTransmission, physicalFields)
+      ];
       return {
         label: "pbr-material-skylight-bgl",
         entries: merged
@@ -1099,6 +1186,6 @@ function selectPasses(passes, selector) {
   );
 }
 
-export { COOKIE_MATRIX_BYTES, COOKIE_SLICE_CAPACITY, COOKIE_SLICE_SIZE, DeviceScope, EXTENDED_LIGHTING_REQUIRED_SAMPLED_TEXTURES, EXTENDED_LIGHTING_TOPOLOGY, GPU_BUFFER_USAGE_COPY_DST, GPU_BUFFER_USAGE_COPY_SRC, GPU_BUFFER_USAGE_INDEX, GPU_BUFFER_USAGE_INDIRECT, GPU_BUFFER_USAGE_MAP_READ, GPU_BUFFER_USAGE_QUERY_RESOLVE, GPU_BUFFER_USAGE_STORAGE, GPU_BUFFER_USAGE_UNIFORM, GPU_BUFFER_USAGE_VERTEX, GPU_SHADER_STAGE_COMPUTE, GPU_SHADER_STAGE_FRAGMENT, GPU_SHADER_STAGE_VERTEX, IES_SLICE_CAPACITY, IES_SLICE_HEIGHT, IES_SLICE_WIDTH, PROBE_BLEND_RECORD_BYTE_SIZE, PROBE_BLEND_RECORD_CAPACITY, PROBE_BLEND_RECORD_STRIDE, SHADOW_CASTER_SHADER_ID, SKIN_MATERIAL_SHADER_ID, SPRITE_PASS_PER_INSTANCE_REGION_VARIANT_SET, buildBindGroupLayoutDescriptor, buildPbrMaterialUserRegionEntries, buildPbrPipelineLayouts, buildPbrSkinLayouts, createHdrpBindGroupLayoutDescriptor, createHdrpSkinBindGroupLayoutDescriptor, createPbrSkinMeshBindGroupEntries, createRenderTargetMaterialSource, deriveExtendedLightingCapability, extendedLightingSampledTextureCapacityAvailable, getTextureIdentity, isStandardPbrMaterialShader, makeZeroCameraFallbackSnapshot, matchPass, pbrSkinMeshDynamicOffsets, probeBlendRecordOffset, resolvePipelineGroup2Contract, resolveRenderTargetMaterialSource, selectPasses, shadowCasterVariantSet, validateGraphTargetCaptureReadback, worldEntityKey };
-//# sourceMappingURL=chunk-HZUPSYW7.mjs.map
-//# sourceMappingURL=chunk-HZUPSYW7.mjs.map
+export { COOKIE_MATRIX_BYTES, COOKIE_SLICE_CAPACITY, COOKIE_SLICE_SIZE, DeviceScope, EXTENDED_LIGHTING_REQUIRED_SAMPLED_TEXTURES, EXTENDED_LIGHTING_TOPOLOGY, GPU_BUFFER_USAGE_COPY_DST, GPU_BUFFER_USAGE_COPY_SRC, GPU_BUFFER_USAGE_INDEX, GPU_BUFFER_USAGE_INDIRECT, GPU_BUFFER_USAGE_MAP_READ, GPU_BUFFER_USAGE_QUERY_RESOLVE, GPU_BUFFER_USAGE_STORAGE, GPU_BUFFER_USAGE_UNIFORM, GPU_BUFFER_USAGE_VERTEX, GPU_SHADER_STAGE_COMPUTE, GPU_SHADER_STAGE_FRAGMENT, GPU_SHADER_STAGE_VERTEX, IES_SLICE_CAPACITY, IES_SLICE_HEIGHT, IES_SLICE_WIDTH, LifecycleTransaction, PROBE_BLEND_RECORD_BYTE_SIZE, PROBE_BLEND_RECORD_CAPACITY, PROBE_BLEND_RECORD_STRIDE, SHADOW_CASTER_SHADER_ID, SKIN_MATERIAL_SHADER_ID, SPRITE_PASS_PER_INSTANCE_REGION_VARIANT_SET, buildBindGroupLayoutDescriptor, buildPbrMaterialUserRegionEntries, buildPbrPipelineLayouts, buildPbrSkinLayouts, createHdrpBindGroupLayoutDescriptor, createHdrpSkinBindGroupLayoutDescriptor, createPbrSkinMeshBindGroupEntries, createRenderTargetMaterialSource, deriveExtendedLightingCapability, extendedLightingSampledTextureCapacityAvailable, getOpaqueResourceIdentity, getTextureIdentity, isCanonicalStandardPbrMaterialShader, isStandardPbrMaterialShader, isStandardPbrSkinMaterialShader, makeZeroCameraFallbackSnapshot, matchPass, materialBindGroupLayoutIdentity, pbrSkinMeshDynamicOffsets, physicalTextureFields, probeBlendRecordOffset, resolvePipelineGroup2Contract, resolveRenderTargetMaterialSource, selectPasses, shadowCasterVariantSet, validateGraphTargetCaptureReadback, worldEntityKey };
+//# sourceMappingURL=chunk-KZFTK6DO.mjs.map
+//# sourceMappingURL=chunk-KZFTK6DO.mjs.map