@babylonjs/core 6.22.1 → 6.23.1

package/Engines/WebGPU/webgpuTextureHelper.d.ts

@@ -6,6 +6,7 @@ import type { WebGPUTintWASM } from "./webgpuTintWASM";
 import type { ExternalTexture } from "../../Materials/Textures/externalTexture";
 /**
  * Map a (renderable) texture format (GPUTextureFormat) to an index for fast lookup (in caches for eg)
+ * The number of entries should not go over 64! Else, the code in WebGPUCacheRenderPipeline.setMRT should be updated
  */
 export declare const renderableTextureFormatToIndex: {
     [name: string]: number;

package/Engines/WebGPU/webgpuTextureHelper.js

@@ -1,4 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable babylonjs/available */
+/* eslint-disable jsdoc/require-jsdoc */
 // License for the mipmap generation code:
 //
 // Copyright 2020 Brandon Jones
@@ -214,6 +216,7 @@ const shadersForPipelineType = [
 ];
 /**
  * Map a (renderable) texture format (GPUTextureFormat) to an index for fast lookup (in caches for eg)
+ * The number of entries should not go over 64! Else, the code in WebGPUCacheRenderPipeline.setMRT should be updated
  */
 export const renderableTextureFormatToIndex = {
     "": 0,
@@ -238,22 +241,24 @@ export const renderableTextureFormatToIndex = {
     rgba8sint: 19,
     bgra8unorm: 20,
     "bgra8unorm-srgb": 21,
-    rgb10a2unorm: 22,
-    rg32uint: 23,
-    rg32sint: 24,
-    rg32float: 25,
-    rgba16uint: 26,
-    rgba16sint: 27,
-    rgba16float: 28,
-    rgba32uint: 29,
-    rgba32sint: 30,
-    rgba32float: 31,
-    stencil8: 32,
-    depth16unorm: 33,
-    depth24plus: 34,
-    "depth24plus-stencil8": 35,
-    depth32float: 36,
-    "depth32float-stencil8": 37,
+    rgb10a2uint: 22,
+    rgb10a2unorm: 23,
+    /* rg11b10ufloat: this entry is dynamically added if the "RG11B10UFloatRenderable" extension is supported */
+    rg32uint: 24,
+    rg32sint: 25,
+    rg32float: 26,
+    rgba16uint: 27,
+    rgba16sint: 28,
+    rgba16float: 29,
+    rgba32uint: 30,
+    rgba32sint: 31,
+    rgba32float: 32,
+    stencil8: 33,
+    depth16unorm: 34,
+    depth24plus: 35,
+    "depth24plus-stencil8": 36,
+    depth32float: 37,
+    "depth32float-stencil8": 38,
 };
 /** @internal */
 export class WebGPUTextureHelper {
@@ -279,7 +284,7 @@ export class WebGPUTextureHelper {
         }
         this._mipmapSampler = device.createSampler({ minFilter: WebGPUConstants.FilterMode.Linear });
         this._videoSampler = device.createSampler({ minFilter: WebGPUConstants.FilterMode.Linear });
-        this._ubCopyWithOfst = this._bufferManager.createBuffer(4 * 4, WebGPUConstants.BufferUsage.Uniform | WebGPUConstants.BufferUsage.CopyDst).underlyingResource;
+        this._ubCopyWithOfst = this._bufferManager.createBuffer(4 * 4, WebGPUConstants.BufferUsage.Uniform | WebGPUConstants.BufferUsage.CopyDst, "UBCopyWithOffset").underlyingResource;
         this._getPipeline(WebGPUConstants.TextureFormat.RGBA8Unorm);
         this._getVideoPipeline(WebGPUConstants.TextureFormat.RGBA8Unorm);
     }
@@ -407,10 +412,10 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.RGBA8Sint:
             case WebGPUConstants.TextureFormat.BGRA8Unorm:
             case WebGPUConstants.TextureFormat.BGRA8UnormSRGB:
+            case WebGPUConstants.TextureFormat.RGB10A2UINT: // composite format - let's say it's byte...
             case WebGPUConstants.TextureFormat.RGB10A2Unorm: // composite format - let's say it's byte...
             case WebGPUConstants.TextureFormat.RGB9E5UFloat: // composite format - let's say it's byte...
             case WebGPUConstants.TextureFormat.RG11B10UFloat: // composite format - let's say it's byte...
-            case WebGPUConstants.TextureFormat.Depth24UnormStencil8: // composite format - let's say it's byte...
             case WebGPUConstants.TextureFormat.Depth32FloatStencil8: // composite format - let's say it's byte...
             case WebGPUConstants.TextureFormat.BC7RGBAUnorm:
             case WebGPUConstants.TextureFormat.BC7RGBAUnormSRGB:
@@ -532,6 +537,7 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.BGRA8Unorm:
             case WebGPUConstants.TextureFormat.BGRA8UnormSRGB:
             case WebGPUConstants.TextureFormat.RGB9E5UFloat:
+            case WebGPUConstants.TextureFormat.RGB10A2UINT:
             case WebGPUConstants.TextureFormat.RGB10A2Unorm:
             case WebGPUConstants.TextureFormat.RG11B10UFloat:
                 return { width: 1, height: 1, length: 4 };
@@ -559,8 +565,6 @@ export class WebGPUTextureHelper {
                 throw "No fixed size for Depth24PlusStencil8 format!";
             case WebGPUConstants.TextureFormat.Depth32Float:
                 return { width: 1, height: 1, length: 4 };
-            case WebGPUConstants.TextureFormat.Depth24UnormStencil8:
-                return { width: 1, height: 1, length: 4 };
             case WebGPUConstants.TextureFormat.Depth32FloatStencil8:
                 return { width: 1, height: 1, length: 5 };
             // BC compressed formats usable if "texture-compression-bc" is both
@@ -725,8 +729,6 @@ export class WebGPUTextureHelper {
                 return WebGPUConstants.TextureFormat.Depth24PlusStencil8;
             case 14:
                 return WebGPUConstants.TextureFormat.Depth32Float;
-            case 17:
-                return WebGPUConstants.TextureFormat.Depth24UnormStencil8;
             case 18:
                 return WebGPUConstants.TextureFormat.Depth32FloatStencil8;
             case 19:
@@ -908,7 +910,7 @@ export class WebGPUTextureHelper {
                     case 5:
                         return WebGPUConstants.TextureFormat.RGB10A2Unorm;
                     case 11:
-                        throw "TEXTUREFORMAT_RGBA_INTEGER format not supported in WebGPU when type is TEXTURETYPE_UNSIGNED_INT_2_10_10_10_REV";
+                        return WebGPUConstants.TextureFormat.RGB10A2UINT;
                     default:
                         return WebGPUConstants.TextureFormat.RGB10A2Unorm;
                 }
@@ -940,8 +942,7 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.RG8Snorm:
             case WebGPUConstants.TextureFormat.RG8Uint:
             case WebGPUConstants.TextureFormat.RG8Sint:
-            case WebGPUConstants.TextureFormat.Depth24UnormStencil8: // composite format - let's say it's byte...
-            case WebGPUConstants.TextureFormat.Depth32FloatStencil8: // composite format - let's say it's byte...
+            case WebGPUConstants.TextureFormat.Depth32FloatStencil8:
             case WebGPUConstants.TextureFormat.BC5RGUnorm:
             case WebGPUConstants.TextureFormat.BC5RGSnorm:
             case WebGPUConstants.TextureFormat.RG16Uint:
@@ -954,8 +955,8 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.EACRG11Unorm:
             case WebGPUConstants.TextureFormat.EACRG11Snorm:
                 return 2;
-            case WebGPUConstants.TextureFormat.RGB9E5UFloat: // composite format - let's say it's byte...
-            case WebGPUConstants.TextureFormat.RG11B10UFloat: // composite format - let's say it's byte...
+            case WebGPUConstants.TextureFormat.RGB9E5UFloat:
+            case WebGPUConstants.TextureFormat.RG11B10UFloat:
             case WebGPUConstants.TextureFormat.BC6HRGBUFloat:
             case WebGPUConstants.TextureFormat.BC6HRGBFloat:
             case WebGPUConstants.TextureFormat.ETC2RGB8Unorm:
@@ -968,7 +969,8 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.RGBA8Sint:
             case WebGPUConstants.TextureFormat.BGRA8Unorm:
             case WebGPUConstants.TextureFormat.BGRA8UnormSRGB:
-            case WebGPUConstants.TextureFormat.RGB10A2Unorm: // composite format - let's say it's byte...
+            case WebGPUConstants.TextureFormat.RGB10A2UINT:
+            case WebGPUConstants.TextureFormat.RGB10A2Unorm:
             case WebGPUConstants.TextureFormat.BC7RGBAUnorm:
             case WebGPUConstants.TextureFormat.BC7RGBAUnormSRGB:
             case WebGPUConstants.TextureFormat.BC3RGBAUnorm:
@@ -1022,7 +1024,6 @@ export class WebGPUTextureHelper {
     static HasStencilAspect(format) {
         switch (format) {
             case WebGPUConstants.TextureFormat.Stencil8:
-            case WebGPUConstants.TextureFormat.Depth24UnormStencil8:
             case WebGPUConstants.TextureFormat.Depth32FloatStencil8:
             case WebGPUConstants.TextureFormat.Depth24PlusStencil8:
                 return true;
@@ -1031,7 +1032,6 @@ export class WebGPUTextureHelper {
     }
     static HasDepthAndStencilAspects(format) {
         switch (format) {
-            case WebGPUConstants.TextureFormat.Depth24UnormStencil8:
             case WebGPUConstants.TextureFormat.Depth32FloatStencil8:
             case WebGPUConstants.TextureFormat.Depth24PlusStencil8:
                 return true;
@@ -1046,8 +1046,6 @@ export class WebGPUTextureHelper {
                 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:
@@ -1544,7 +1542,7 @@ export class WebGPUTextureHelper {
             const aligned = Math.ceil(bytesPerRow / 256) * 256 === bytesPerRow;
             if (aligned) {
                 const commandEncoder = this._device.createCommandEncoder({});
-                const buffer = this._bufferManager.createRawBuffer(imageBitmap.byteLength, WebGPUConstants.BufferUsage.MapWrite | WebGPUConstants.BufferUsage.CopySrc, true);
+                const buffer = this._bufferManager.createRawBuffer(imageBitmap.byteLength, WebGPUConstants.BufferUsage.MapWrite | WebGPUConstants.BufferUsage.CopySrc, true, "TempBufferForUpdateTexture" + (gpuTexture ? "_" + gpuTexture.label : ""));
                 const arrayBuffer = buffer.getMappedRange();
                 new Uint8Array(arrayBuffer).set(imageBitmap);
                 buffer.unmap();
@@ -1613,7 +1611,7 @@ export class WebGPUTextureHelper {
         const bytesPerRow = Math.ceil(width / blockInformation.width) * blockInformation.length;
         const bytesPerRowAligned = Math.ceil(bytesPerRow / 256) * 256;
         const size = bytesPerRowAligned * height;
-        const gpuBuffer = this._bufferManager.createRawBuffer(size, WebGPUConstants.BufferUsage.MapRead | WebGPUConstants.BufferUsage.CopyDst);
+        const gpuBuffer = this._bufferManager.createRawBuffer(size, WebGPUConstants.BufferUsage.MapRead | WebGPUConstants.BufferUsage.CopyDst, undefined, "TempBufferForReadPixels" + (texture.label ? "_" + texture.label : ""));
         const commandEncoder = this._device.createCommandEncoder({});
         commandEncoder.copyTextureToBuffer({
             texture,