Remove the helper function wgpu_command_encoder_begin_render_pass_1color_0depth(). While it was much smaller, the code size benefit does not compose well with larger applications.

Author: juj

lib/lib_webgpu.h

@@ -2167,8 +2167,6 @@ typedef WGpuObjectBase WGpuCommandEncoder;
 WGPU_BOOL wgpu_is_command_encoder(WGpuObjectBase object);
 
 WGpuRenderPassEncoder wgpu_command_encoder_begin_render_pass(WGpuCommandEncoder commandEncoder, const WGpuRenderPassDescriptor *renderPassDesc NOTNULL);
-// Like above, but tiny code size path for the case when there is exactly one color and zero depth-stencil targets and no occlusion query set specified for the render pass.
-WGpuRenderPassEncoder wgpu_command_encoder_begin_render_pass_1color_0depth(WGpuCommandEncoder commandEncoder, const WGpuRenderPassDescriptor *renderPassDesc NOTNULL);
 WGpuComputePassEncoder wgpu_command_encoder_begin_compute_pass(WGpuCommandEncoder commandEncoder, const WGpuComputePassDescriptor *computePassDesc _WGPU_DEFAULT_VALUE(0));
 void wgpu_command_encoder_copy_buffer_to_buffer(WGpuCommandEncoder commandEncoder, WGpuBuffer source, double_int53_t sourceOffset, WGpuBuffer destination, double_int53_t destinationOffset, double_int53_t size);
 void wgpu_command_encoder_copy_buffer_to_texture(WGpuCommandEncoder commandEncoder, const WGpuImageCopyBuffer *source NOTNULL, const WGpuImageCopyTexture *destination NOTNULL, uint32_t copyWidth, uint32_t copyHeight _WGPU_DEFAULT_VALUE(1), uint32_t copyDepthOrArrayLayers _WGPU_DEFAULT_VALUE(1));

lib/lib_webgpu.js

@@ -2052,39 +2052,6 @@ let api = {
     return wgpuStore(wgpu[commandEncoder]['beginRenderPass'](desc));
   },
 
-  wgpu_command_encoder_begin_render_pass_1color_0depth__deps: ['$GPULoadOps', '$GPUStoreOps'],
-  wgpu_command_encoder_begin_render_pass_1color_0depth: function(commandEncoder, descriptor) {
-    {{{ wdebuglog('`wgpu_command_encoder_begin_render_pass_1color_0depth(commandEncoder=${commandEncoder}, descriptor=${descriptor})`'); }}}
-    {{{ wassert('commandEncoder != 0'); }}}
-    {{{ wassert('wgpu[commandEncoder]'); }}}
-    {{{ wassert('wgpu[commandEncoder] instanceof GPUCommandEncoder'); }}}
-    {{{ wassert('descriptor != 0'); }}}
-
-    {{{ ptrToIdx('descriptor', 2); }}}
-
-    {{{ wassert('HEAP32[descriptor+4] == 1'); }}} // Must be passing exactly one color target.
-    {{{ wassert('HEAPU32[descriptor+5] == 0'); }}} // Must be passing no depth-stencil target.
-
-    let colorAttachmentsIdx = {{{ readIdx32('descriptor+2') }}},
-      colorAttachmentsIdxDbl = {{{ shiftIndex('colorAttachmentsIdx + 6', 1) }}}; // Alias the view for HEAPF64.
-
-    {{{ wassert('colorAttachmentsIdx % 2 == 0'); }}} // Must be aligned at double boundary
-
-    let desc = {
-      'colorAttachments': [{
-        'view': wgpu[HEAPU32[colorAttachmentsIdx]],
-        'depthSlice': HEAP32[colorAttachmentsIdx+1] < 0 ? void 0 : HEAP32[colorAttachmentsIdx+1], // Awkward polymorphism: spec does not allow 'depthSlice' to be given a value (even 0) if attachment is not a 3D texture.
-        'resolveTarget': wgpu[HEAPU32[colorAttachmentsIdx+2]],
-        'storeOp': GPUStoreOps[HEAPU32[colorAttachmentsIdx+3]],
-        'loadOp': GPULoadOps[HEAPU32[colorAttachmentsIdx+4]],
-        'clearValue': [HEAPF64[colorAttachmentsIdxDbl  ], HEAPF64[colorAttachmentsIdxDbl+1],
-                       HEAPF64[colorAttachmentsIdxDbl+2], HEAPF64[colorAttachmentsIdxDbl+3]]
-      }]
-    };
-    {{{ wdebugdir('desc', '`GPUCommandEncoder.beginRenderPass() with descriptor:`') }}};
-    return wgpuStore(wgpu[commandEncoder]['beginRenderPass'](desc));
-  },
-
   wgpu_command_encoder_begin_compute_pass__deps: ['$wgpuReadTimestampWrites'],
   wgpu_command_encoder_begin_compute_pass: function(commandEncoder, descriptor) {
     {{{ wdebuglog('`wgpu_command_encoder_begin_compute_pass(commandEncoder=${commandEncoder}, descriptor=${descriptor})`'); }}}

lib/lib_webgpu_dawn.cpp

@@ -2095,24 +2095,6 @@ WGpuRenderPassEncoder wgpu_command_encoder_begin_render_pass(WGpuCommandEncoder
   return _wgpu_store(kWebGPURenderPassEncoder, renderPassEncoder);
 }
 
-WGpuRenderPassEncoder wgpu_command_encoder_begin_render_pass_1color_0depth(WGpuCommandEncoder commandEncoder, const WGpuRenderPassDescriptor *renderPassDesc) {
-  assert(wgpu_is_command_encoder(commandEncoder));
-  assert(renderPassDesc);
-
-  WGPURenderPassDescriptor _desc = {};
-  _desc.colorAttachmentCount = 1;
-  WGPURenderPassColorAttachment _attachment = getColorAttachInfo(renderPassDesc->colorAttachments[0]);
-  _desc.colorAttachments = &_attachment;
-  _desc.depthStencilAttachment = nullptr;
-  _desc.occlusionQuerySet = _wgpu_get_dawn<WGPUQuerySet>(renderPassDesc->occlusionQuerySet);
-  _desc.timestampWrites = nullptr;
-  _desc.label = nullptr;
-  _desc.nextInChain = nullptr;
-
-  WGPURenderPassEncoder renderPassEncoder = wgpuCommandEncoderBeginRenderPass(_wgpu_get_dawn<WGPUCommandEncoder>(commandEncoder), &_desc);
-  return _wgpu_store(kWebGPURenderPassEncoder, renderPassEncoder);
-}
-
 WGpuComputePassEncoder wgpu_command_encoder_begin_compute_pass(WGpuCommandEncoder commandEncoder, const WGpuComputePassDescriptor *computePassDesc) {
   assert(wgpu_is_command_encoder(commandEncoder));
 

samples/clear_screen/clear_screen.c

@@ -26,7 +26,7 @@ WGPU_BOOL raf(double time, void *userData)
   passDesc.numColorAttachments = 1;
   passDesc.colorAttachments = &colorAttachment;
 
-  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass_1color_0depth(encoder, &passDesc));
+  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass(encoder, &passDesc));
   wgpu_queue_submit_one_and_destroy(wgpu_device_get_queue(device), wgpu_command_encoder_finish(encoder));
 
   return EM_TRUE;

samples/clear_screen/clear_screen_sync.c

@@ -35,7 +35,7 @@ int main(int argc, char **argv)
     passDesc.numColorAttachments = 1;
     passDesc.colorAttachments = &colorAttachment;
 
-    wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass_1color_0depth(encoder, &passDesc));
+    wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass(encoder, &passDesc));
     wgpu_queue_submit_one_and_destroy(wgpu_device_get_queue(device), wgpu_command_encoder_finish(encoder));
 
     // This sample shows how to use a synchronous-looking infinite rendering loop,

samples/offscreen_canvas/offscreen_canvas.c

@@ -112,7 +112,7 @@ WGPU_BOOL raf(double time, void *userData) // runs in worker thread
   passDesc.numColorAttachments = 1;
   passDesc.colorAttachments = &colorAttachment;
 
-  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass_1color_0depth(encoder, &passDesc));
+  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass(encoder, &passDesc));
   wgpu_queue_submit_one_and_destroy(wgpu_device_get_queue(device), wgpu_command_encoder_finish(encoder));
 
   return EM_TRUE;

samples/offscreen_canvas/offscreen_canvas_proxy_to_pthread.c

@@ -78,7 +78,7 @@ WGPU_BOOL raf(double time, void *userData) // runs in pthread
   passDesc.numColorAttachments = 1;
   passDesc.colorAttachments = &colorAttachment;
 
-  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass_1color_0depth(encoder, &passDesc));
+  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass(encoder, &passDesc));
   wgpu_queue_submit_one_and_destroy(wgpu_device_get_queue(device), wgpu_command_encoder_finish(encoder));
 
   return EM_TRUE;

samples/offscreen_canvas/offscreen_canvas_pthread.c

@@ -127,7 +127,7 @@ WGPU_BOOL raf(double time, void *userData) // runs in pthread
   passDesc.numColorAttachments = 1;
   passDesc.colorAttachments = &colorAttachment;
 
-  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass_1color_0depth(encoder, &passDesc));
+  wgpu_render_pass_encoder_end(wgpu_command_encoder_begin_render_pass(encoder, &passDesc));
   wgpu_queue_submit_one_and_destroy(wgpu_device_get_queue(device), wgpu_command_encoder_finish(encoder));
 
   return EM_TRUE;