@babylonjs/core 5.52.0 → 5.53.1

package/Engines/WebGPU/webgpuTextureHelper.js

@@ -726,6 +726,8 @@ export class WebGPUTextureHelper {
                 return WebGPUConstants.TextureFormat.Depth24UnormStencil8;
             case 18:
                 return WebGPUConstants.TextureFormat.Depth32FloatStencil8;
+            case 19:
+                return WebGPUConstants.TextureFormat.Stencil8;
             case 36492:
                 return useSRGBBuffer ? WebGPUConstants.TextureFormat.BC7RGBAUnormSRGB : WebGPUConstants.TextureFormat.BC7RGBAUnorm;
             case 36495:
@@ -1019,6 +1021,23 @@ export class WebGPUTextureHelper {
         }
         return false;
     }
+    static GetDepthFormatOnly(format) {
+        switch (format) {
+            case WebGPUConstants.TextureFormat.Depth16Unorm:
+                return WebGPUConstants.TextureFormat.Depth16Unorm;
+            case WebGPUConstants.TextureFormat.Depth24Plus:
+                return WebGPUConstants.TextureFormat.Depth24Plus;
+            case WebGPUConstants.TextureFormat.Depth24PlusStencil8:
+                return WebGPUConstants.TextureFormat.Depth24Plus;
+            case WebGPUConstants.TextureFormat.Depth24UnormStencil8:
+                return WebGPUConstants.TextureFormat.Depth24Plus;
+            case WebGPUConstants.TextureFormat.Depth32Float:
+                return WebGPUConstants.TextureFormat.Depth32Float;
+            case WebGPUConstants.TextureFormat.Depth32FloatStencil8:
+                return WebGPUConstants.TextureFormat.Depth32Float;
+        }
+        return format;
+    }
     copyVideoToTexture(video, texture, format, invertY = false, commandEncoder) {
         var _a, _b, _c, _d;
         const useOwnCommandEncoder = commandEncoder === undefined;
@@ -1106,7 +1125,7 @@ export class WebGPUTextureHelper {
             this._bufferManager.setRawData(this._ubCopyWithOfst, 0, new Float32Array([ofstX, ofstY, rectWidth, rectHeight]), 0, 4 * 4);
         }
         const webgpuHardwareTexture = gpuOrHdwTexture;
-        const outputTexture = (_c = webgpuHardwareTexture === null || webgpuHardwareTexture === void 0 ? void 0 : webgpuHardwareTexture._copyInvertYTempTexture) !== null && _c !== void 0 ? _c : this.createTexture({ width, height, layers: 1 }, false, false, false, false, false, format, 1, commandEncoder, WebGPUConstants.TextureUsage.CopySrc | WebGPUConstants.TextureUsage.RenderAttachment | WebGPUConstants.TextureUsage.TextureBinding);
+        const outputTexture = (_c = webgpuHardwareTexture === null || webgpuHardwareTexture === void 0 ? void 0 : webgpuHardwareTexture._copyInvertYTempTexture) !== null && _c !== void 0 ? _c : this.createTexture({ width, height, layers: 1 }, false, false, false, false, false, format, 1, commandEncoder, WebGPUConstants.TextureUsage.CopySrc | WebGPUConstants.TextureUsage.RenderAttachment | WebGPUConstants.TextureUsage.TextureBinding, undefined, "TempTextureForCopyWithInvertY");
         const renderPassDescriptor = (_d = webgpuHardwareTexture === null || webgpuHardwareTexture === void 0 ? void 0 : webgpuHardwareTexture._copyInvertYRenderPassDescr) !== null && _d !== void 0 ? _d : {
             colorAttachments: [
                 {
@@ -1221,7 +1240,7 @@ export class WebGPUTextureHelper {
     //------------------------------------------------------------------------------
     //                               Creation
     //------------------------------------------------------------------------------
-    createTexture(imageBitmap, hasMipmaps = false, generateMipmaps = false, invertY = false, premultiplyAlpha = false, is3D = false, format = WebGPUConstants.TextureFormat.RGBA8Unorm, sampleCount = 1, commandEncoder, usage = -1, additionalUsages = 0) {
+    createTexture(imageBitmap, hasMipmaps = false, generateMipmaps = false, invertY = false, premultiplyAlpha = false, is3D = false, format = WebGPUConstants.TextureFormat.RGBA8Unorm, sampleCount = 1, commandEncoder, usage = -1, additionalUsages = 0, label) {
         if (sampleCount > 1) {
             // WebGPU only supports 1 or 4
             sampleCount = 4;
@@ -1241,7 +1260,7 @@ export class WebGPUTextureHelper {
             additionalUsages |= WebGPUConstants.TextureUsage.RenderAttachment | WebGPUConstants.TextureUsage.CopyDst;
         }
         const gpuTexture = this._device.createTexture({
-            label: `Texture_${textureSize.width}x${textureSize.height}x${textureSize.depthOrArrayLayers}_${hasMipmaps ? "wmips" : "womips"}_${format}_samples${sampleCount}`,
+            label: `Texture_${label ? label + "_" : ""}${textureSize.width}x${textureSize.height}x${textureSize.depthOrArrayLayers}_${hasMipmaps ? "wmips" : "womips"}_${format}_samples${sampleCount}`,
             size: textureSize,
             dimension: is3D ? WebGPUConstants.TextureDimension.E3d : WebGPUConstants.TextureDimension.E2d,
             format,
@@ -1257,7 +1276,7 @@ export class WebGPUTextureHelper {
         }
         return gpuTexture;
     }
-    createCubeTexture(imageBitmaps, hasMipmaps = false, generateMipmaps = false, invertY = false, premultiplyAlpha = false, format = WebGPUConstants.TextureFormat.RGBA8Unorm, sampleCount = 1, commandEncoder, usage = -1, additionalUsages = 0) {
+    createCubeTexture(imageBitmaps, hasMipmaps = false, generateMipmaps = false, invertY = false, premultiplyAlpha = false, format = WebGPUConstants.TextureFormat.RGBA8Unorm, sampleCount = 1, commandEncoder, usage = -1, additionalUsages = 0, label) {
         if (sampleCount > 1) {
             // WebGPU only supports 1 or 4
             sampleCount = 4;
@@ -1273,7 +1292,7 @@ export class WebGPUTextureHelper {
             additionalUsages |= WebGPUConstants.TextureUsage.RenderAttachment | WebGPUConstants.TextureUsage.CopyDst;
         }
         const gpuTexture = this._device.createTexture({
-            label: `TextureCube_${width}x${height}x6_${hasMipmaps ? "wmips" : "womips"}_${format}_samples${sampleCount}`,
+            label: `TextureCube_${label ? label + "_" : ""}${width}x${height}x6_${hasMipmaps ? "wmips" : "womips"}_${format}_samples${sampleCount}`,
             size: {
                 width,
                 height,
@@ -1422,23 +1441,23 @@ export class WebGPUTextureHelper {
             mipmapCount = hasMipMaps ? WebGPUTextureHelper.ComputeNumMipmapLevels(width, height) : 1;
         }
         if (texture.isCube) {
-            const gpuTexture = this.createCubeTexture({ width, height }, texture.generateMipMaps, texture.generateMipMaps, texture.invertY, false, gpuTextureWrapper.format, 1, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages);
+            const gpuTexture = this.createCubeTexture({ width, height }, texture.generateMipMaps, texture.generateMipMaps, texture.invertY, false, gpuTextureWrapper.format, 1, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages, texture.label);
             gpuTextureWrapper.set(gpuTexture);
             gpuTextureWrapper.createView({
-                format: gpuTextureWrapper.format,
+                format: WebGPUTextureHelper.GetDepthFormatOnly(gpuTextureWrapper.format),
                 dimension: WebGPUConstants.TextureViewDimension.Cube,
                 mipLevelCount: mipmapCount,
                 baseArrayLayer: 0,
                 baseMipLevel: 0,
                 arrayLayerCount: 6,
-                aspect: WebGPUConstants.TextureAspect.All,
+                aspect: WebGPUTextureHelper.HasDepthAndStencilAspects(gpuTextureWrapper.format) ? WebGPUConstants.TextureAspect.DepthOnly : WebGPUConstants.TextureAspect.All,
             }, isStorageTexture);
         }
         else {
-            const gpuTexture = this.createTexture({ width, height, layers: layerCount }, texture.generateMipMaps, texture.generateMipMaps, texture.invertY, false, texture.is3D, gpuTextureWrapper.format, 1, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages);
+            const gpuTexture = this.createTexture({ width, height, layers: layerCount }, texture.generateMipMaps, texture.generateMipMaps, texture.invertY, false, texture.is3D, gpuTextureWrapper.format, 1, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages, texture.label);
             gpuTextureWrapper.set(gpuTexture);
             gpuTextureWrapper.createView({
-                format: gpuTextureWrapper.format,
+                format: WebGPUTextureHelper.GetDepthFormatOnly(gpuTextureWrapper.format),
                 dimension: texture.is2DArray
                     ? WebGPUConstants.TextureViewDimension.E2dArray
                     : texture.is3D
@@ -1448,7 +1467,7 @@ export class WebGPUTextureHelper {
                 baseArrayLayer: 0,
                 baseMipLevel: 0,
                 arrayLayerCount: texture.is3D ? 1 : layerCount,
-                aspect: WebGPUConstants.TextureAspect.All,
+                aspect: WebGPUTextureHelper.HasDepthAndStencilAspects(gpuTextureWrapper.format) ? WebGPUConstants.TextureAspect.DepthOnly : WebGPUConstants.TextureAspect.All,
             }, isStorageTexture);
         }
         texture.width = texture.baseWidth = width;
@@ -1470,11 +1489,11 @@ export class WebGPUTextureHelper {
         const height = texture.height;
         const layerCount = texture.depth || 1;
         if (texture.isCube) {
-            const gpuMSAATexture = this.createCubeTexture({ width, height }, false, false, texture.invertY, false, gpuTextureWrapper.format, samples, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages);
+            const gpuMSAATexture = this.createCubeTexture({ width, height }, false, false, texture.invertY, false, gpuTextureWrapper.format, samples, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages, texture.label ? "MSAA" + texture.label : undefined);
             gpuTextureWrapper.msaaTexture = gpuMSAATexture;
         }
         else {
-            const gpuMSAATexture = this.createTexture({ width, height, layers: layerCount }, false, false, texture.invertY, false, texture.is3D, gpuTextureWrapper.format, samples, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages);
+            const gpuMSAATexture = this.createTexture({ width, height, layers: layerCount }, false, false, texture.invertY, false, texture.is3D, gpuTextureWrapper.format, samples, this._commandEncoderForCreation, gpuTextureWrapper.textureUsages, gpuTextureWrapper.textureAdditionalUsages, texture.label ? "MSAA" + texture.label : undefined);
             gpuTextureWrapper.msaaTexture = gpuMSAATexture;
         }
     }
@@ -1560,7 +1579,7 @@ export class WebGPUTextureHelper {
                     // we must apply the preprocessing on the source image before copying it into the destination texture
                     const commandEncoder = this._device.createCommandEncoder({});
                     // create a temp texture and copy the image to it
-                    const srcTexture = this.createTexture({ width, height, layers: 1 }, false, false, false, false, false, format, 1, commandEncoder, WebGPUConstants.TextureUsage.CopySrc | WebGPUConstants.TextureUsage.TextureBinding);
+                    const srcTexture = this.createTexture({ width, height, layers: 1 }, false, false, false, false, false, format, 1, commandEncoder, WebGPUConstants.TextureUsage.CopySrc | WebGPUConstants.TextureUsage.TextureBinding, undefined, "TempTextureForUpdateTexture");
                     this._deferredReleaseTextures.push([srcTexture, null]);
                     textureExtent.depthOrArrayLayers = 1;
                     this._device.queue.copyExternalImageToTexture({ source: imageBitmap }, { texture: srcTexture }, textureExtent);