Address latest feedback

emscripten-core · May 22, 2024 · 6f82930 · 6f82930
1 parent 084f0a0
commit 6f82930
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/library_webgpu.js b/src/library_webgpu.js
@@ -99,6 +99,9 @@ wgpu${type}Release: (id) => WebGPU.mgr${type}.release(id),`;
       DeviceLost: 2,
       Unknown: 3,
     },
+    CompositeAlphaMode: {
+      Opaque: 1,
+    },
     CreatePipelineAsyncStatus: {
       Success: 0,
       ValidationError: 1,
@@ -2686,6 +2689,11 @@ var LibraryWebGPU = {
     var context = WebGPU.mgrSurface.get(surfaceId);
 
 #if ASSERTIONS
+    var viewFormatCount = {{{ gpu.makeGetU32('config', C_STRUCTS.WGPUSurfaceConfiguration.viewFormatCount) }}};
+    var viewFormats = {{{ makeGetValue('config', C_STRUCTS.WGPUSurfaceConfiguration.viewFormats, '*') }}};
+    assert(viewFormatCount === 0 && viewFormats === 0, "TODO: Support viewFormats.");
+    var alphaMode = {{{ gpu.makeGetU32('config', C_STRUCTS.WGPUSurfaceConfiguration.alphaMode) }}};
+    assert({{{ gpu.CompositeAlphaMode.Opaque }}} === alphaMode, "TODO: Support alphaMode.");
     assert({{{ gpu.PresentMode.Fifo }}} ===
       {{{ gpu.makeGetU32('config', C_STRUCTS.WGPUSurfaceConfiguration.presentMode) }}});
 #endif
@@ -2708,12 +2716,7 @@ var LibraryWebGPU = {
       "format": WebGPU.TextureFormat[
         {{{ gpu.makeGetU32('config', C_STRUCTS.WGPUSurfaceConfiguration.format) }}}],
       "usage": {{{ gpu.makeGetU32('config', C_STRUCTS.WGPUSurfaceConfiguration.usage) }}},
-      // viewFormatCount
-      // viewFormats
       "alphaMode": "opaque",
-      "width": canvasSize[0],
-      "height": canvasSize[1],
-      "presentMode": {{{ gpu.makeGetU32('config', C_STRUCTS.WGPUSurfaceConfiguration.presentMode) }}},
     };
     context.configure(configuration);
   },

diff --git a/test/webgpu_basic_rendering.cpp b/test/webgpu_basic_rendering.cpp
@@ -400,7 +400,7 @@ void run() {
             .device = device,
             .format = capabilities.formats[0],
             .usage = wgpu::TextureUsage::RenderAttachment,
-            .alphaMode = wgpu::CompositeAlphaMode::Auto,
+            .alphaMode = wgpu::CompositeAlphaMode::Opaque,
             .width = kWidth,
             .height = kHeight,
             .presentMode = wgpu::PresentMode::Fifo};