[pull] main from gpuweb:main

src/webgpu/api/validation/capability_checks/limits/maxColorAttachmentBytesPerSample.spec.ts

@@ -95,14 +95,16 @@ function getPipelineDescriptor(
     return;
   }
 
+  const typedVec = interleaveFormat.includes('uint') ? 'vec4u' : 'vec4f';
+
   const code = `
     ${getDescription(testValue, actualLimit, sampleCount, targets)}
     @vertex fn vs() -> @builtin(position) vec4f {
       return vec4f(0);
     }
 
-    @fragment fn fs() -> @location(0) vec4f {
-      return vec4f(0);
+    @fragment fn fs() -> @location(0) ${typedVec} {
+      return ${typedVec}(0);
     }
   `;
   const module = device.createShaderModule({ code });

src/webgpu/shader/execution/expression/call/builtin/textureLoad.spec.ts

@@ -215,6 +215,7 @@ Parameters:
     const calls: TextureCall<vec2>[] = generateTextureBuiltinInputs2D(50, {
       method: samplePoints,
       descriptor,
+      mipLevel: { num: texture.mipLevelCount, type: L },
       hashInputs: [stage, format, samplePoints, C, L],
     }).map(({ coords, mipLevel }) => {
       return {

src/webgpu/web_platform/canvas/configure.spec.ts

@@ -157,6 +157,7 @@ g.test('format')
   )
   .beforeAllSubcases(t => {
     t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
   })
   .fn(t => {
     const { canvasType, format } = t.params;
@@ -446,6 +447,7 @@ g.test('viewFormats')
       )
   )
   .beforeAllSubcases(t => {
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
     t.selectDeviceOrSkipTestCase([t.params.viewFormatFeature]);
   })
   .fn(t => {

src/webgpu/web_platform/canvas/readbackFromWebGPUCanvas.spec.ts

@@ -261,6 +261,10 @@ g.test('onscreenCanvas,snapshot')
       .combine('colorSpace', kCanvasColorSpaces)
       .combine('snapshotType', ['toDataURL', 'toBlob', 'imageBitmap'])
   )
+  .beforeAllSubcases(t => {
+    // rgba16float may not be color-renderable in compat mode
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+  })
   .fn(async t => {
     const canvas = initWebGPUCanvasContent(
       t,
@@ -323,6 +327,10 @@ g.test('offscreenCanvas,snapshot')
       .combine('colorSpace', kCanvasColorSpaces)
       .combine('snapshotType', ['convertToBlob', 'transferToImageBitmap', 'imageBitmap'] as const)
   )
+  .beforeAllSubcases(t => {
+    // rgba16float may not be color-renderable in compat mode
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+  })
   .fn(async t => {
     const offscreenCanvas = initWebGPUCanvasContent(
       t,
@@ -378,6 +386,10 @@ g.test('onscreenCanvas,uploadToWebGL')
       .combine('webgl', ['webgl', 'webgl2'])
       .combine('upload', ['texImage2D', 'texSubImage2D'])
   )
+  .beforeAllSubcases(t => {
+    // rgba16float may not be color-renderable in compat mode
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+  })
   .fn(t => {
     const { format, webgl, upload } = t.params;
     const canvas = initWebGPUCanvasContent(t, format, t.params.alphaMode, 'srgb', 'onscreen');
@@ -459,6 +471,10 @@ g.test('drawTo2DCanvas')
       .combine('webgpuCanvasType', kAllCanvasTypes)
       .combine('canvas2DType', kAllCanvasTypes)
   )
+  .beforeAllSubcases(t => {
+    // rgba16float may not be color-renderable in compat mode
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+  })
   .fn(t => {
     const { format, webgpuCanvasType, alphaMode, colorSpace, canvas2DType } = t.params;
 

src/webgpu/web_platform/copyToTexture/ImageBitmap.spec.ts

@@ -61,6 +61,7 @@ g.test('from_ImageData')
   .beforeAllSubcases(t => {
     t.skipIf(typeof ImageData === 'undefined', 'ImageData does not exist in this environment');
     t.skipIfTextureFormatNotSupported(t.params.dstFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstFormat);
   })
   .fn(async t => {
     const {
@@ -182,6 +183,7 @@ g.test('from_canvas')
   .beforeAllSubcases(t => {
     t.skipIf(typeof ImageData === 'undefined', 'ImageData does not exist in this environment');
     t.skipIfTextureFormatNotSupported(t.params.dstFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstFormat);
   })
   .fn(async t => {
     const {

src/webgpu/web_platform/copyToTexture/ImageData.spec.ts

@@ -49,6 +49,7 @@ g.test('from_ImageData')
   .beforeAllSubcases(t => {
     t.skipIf(typeof ImageData === 'undefined', 'ImageData does not exist in this environment');
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
   })
   .fn(t => {
     const { width, height, dstColorFormat, dstPremultiplied, srcDoFlipYDuringCopy } = t.params;

src/webgpu/web_platform/copyToTexture/canvas.spec.ts

@@ -495,6 +495,7 @@ g.test('copy_contents_from_2d_context_canvas')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
   })
   .fn(t => {
     const { width, height, canvasType, dstAlphaMode } = t.params;
@@ -559,6 +560,7 @@ g.test('copy_contents_from_gl_context_canvas')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
   })
   .fn(t => {
     const { width, height, canvasType, contextName, srcPremultiplied, dstAlphaMode } = t.params;
@@ -628,6 +630,7 @@ g.test('copy_contents_from_gpu_context_canvas')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
     t.selectMismatchedDeviceOrSkipTestCase(undefined);
   })
   .fn(t => {
@@ -694,6 +697,7 @@ g.test('copy_contents_from_bitmaprenderer_context_canvas')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
   })
   .fn(async t => {
     const { width, height, canvasType, dstAlphaMode } = t.params;
@@ -770,6 +774,7 @@ g.test('color_space_conversion')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
   })
   .fn(t => {
     const {

src/webgpu/web_platform/copyToTexture/image.spec.ts

@@ -63,6 +63,7 @@ g.test('from_image')
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.dstColorFormat);
     if (typeof HTMLImageElement === 'undefined') t.skip('HTMLImageElement not available');
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.dstColorFormat);
   })
   .fn(async t => {
     const { width, height, dstColorFormat, dstPremultiplied, srcDoFlipYDuringCopy } = t.params;