Pass extent for non headless

Author: jc3265

filament/backend/src/webgpu/WebGPUDriver.cpp

@@ -1154,11 +1154,11 @@ void WebGPUDriver::makeCurrent(Handle<HwSwapChain> drawSch, Handle<HwSwapChain>
     auto swapChain = handleCast<WebGPUSwapChain>(drawSch);
     mSwapChain = swapChain;
     assert_invariant(mSwapChain);
-    if(!mSwapChain->isHeadless()){
-         wgpu::Extent2D extent = mPlatform.getSurfaceExtent(mNativeWindow);
-         mTextureView = mSwapChain->getCurrentTextureView(extent);
+
+    if (mSwapChain->isHeadless()) {
+        mTextureView = mSwapChain->getNextTextureView();
     } else {
-        mTextureView = mSwapChain->getCurrentHeadlessTextureView();
+        mTextureView = mSwapChain->getNextTextureView(mPlatform.getSurfaceExtent(mNativeWindow));
     }
 
     assert_invariant(mTextureView);
@@ -1251,7 +1251,7 @@ void WebGPUDriver::readPixels(Handle<HwRenderTarget> sourceRenderTargetHandle, c
     wgpu::Texture srcTexture = nullptr;
     if (srcTarget->isDefaultRenderTarget()) {
         assert_invariant(mSwapChain);
-        srcTexture = mSwapChain->getCurrentTexture(mPlatform.getSurfaceExtent(mNativeWindow));
+        srcTexture = mSwapChain->getCurrentTexture();
     } else {
         // Handle custom render targets. Read from the first color attachment.
         const auto& colorAttachmentInfos = srcTarget->getColorAttachmentInfos();

filament/backend/src/webgpu/WebGPUSwapChain.cpp

@@ -187,7 +187,7 @@ void initConfig(wgpu::SurfaceConfiguration& config, wgpu::Device const& device,
         wgpu::SurfaceCapabilities const& capabilities, wgpu::Extent2D const& extent,
         bool useSRGBColorSpace) {
     config.device = device;
-    config.usage = wgpu::TextureUsage::RenderAttachment;
+    config.usage = wgpu::TextureUsage::RenderAttachment | wgpu::TextureUsage::CopySrc;
     config.width = extent.width;
     config.height = extent.height;
     config.format = selectColorFormat(capabilities.formatCount, capabilities.formats, useSRGBColorSpace);
@@ -352,47 +352,45 @@ void WebGPUSwapChain::setExtent(wgpu::Extent2D const& currentSurfaceSize) {
     }
 }
 
-wgpu::TextureView WebGPUSwapChain::getCurrentTextureView( wgpu::Extent2D const& extent) {
+wgpu::TextureView WebGPUSwapChain::getNextTextureView() {
+    assert_invariant(isHeadless());
+
+    mHeadlessBufferIndex = (mHeadlessBufferIndex + 1) % mHeadlessBufferCount;
+    return mRenderTargetViews[mHeadlessBufferIndex];
+}
+
+wgpu::TextureView WebGPUSwapChain::getNextTextureView( wgpu::Extent2D const& extent) {
     setExtent(extent);
-    wgpu::SurfaceTexture surfaceTexture;
-    mSurface.GetCurrentTexture(&surfaceTexture);
-    if (surfaceTexture.status != wgpu::SurfaceGetCurrentTextureStatus::SuccessOptimal) {
+
+    mSurface.GetCurrentTexture(&mCurrentTexture);
+    if (mCurrentTexture.status != wgpu::SurfaceGetCurrentTextureStatus::SuccessOptimal) {
         return nullptr;
     }
 
     // TODO: review these initializations as webgpu pipeline gets mature
     wgpu::TextureViewDescriptor textureViewDescriptor = {
         .label = "surface_texture_view",
-        .format = surfaceTexture.texture.GetFormat(),
+        .format = mCurrentTexture.texture.GetFormat(),
         .dimension = wgpu::TextureViewDimension::e2D,
         .baseMipLevel = 0,
         .mipLevelCount = 1,
         .baseArrayLayer = 0,
         .arrayLayerCount = 1
     };
-    return surfaceTexture.texture.CreateView(&textureViewDescriptor);
+    return mCurrentTexture.texture.CreateView(&textureViewDescriptor);
 }
 
-wgpu::Texture WebGPUSwapChain::getCurrentTexture(wgpu::Extent2D const& extent) {
+wgpu::Texture WebGPUSwapChain::getCurrentTexture() {
     if (isHeadless()) {
         return mRenderTargetTextures[mHeadlessBufferIndex];
     }
-    // We should return the actual texture that was in use, but we don't keep a direct handle to it.
-    // The non-headless case for this isn't currently relevant (Since this is only used by headless
-    // rendering captured by readPixels), but if we need it this can be done in the future
-    FILAMENT_CHECK_POSTCONDITION(false)
-            << "getCurrentTexture is not implemented for non-headless mode.";
-    return nullptr;
-}
+    // We return the texture that was in use
+    return mCurrentTexture.texture;
 
-wgpu::TextureView WebGPUSwapChain::getCurrentHeadlessTextureView() {
-    return mRenderTargetViews[mHeadlessBufferIndex];
 }
 
 void WebGPUSwapChain::present() {
-    if (isHeadless()) {
-        mHeadlessBufferIndex = (mHeadlessBufferIndex + 1) % mHeadlessBufferCount;
-    } else {
+    if (!isHeadless()) {
         mSurface.Present();
     }
 }

filament/backend/src/webgpu/WebGPUSwapChain.h

@@ -40,9 +40,10 @@ class WebGPUSwapChain final : public Platform::SwapChain, HwSwapChain {
 
     [[nodiscard]] wgpu::TextureFormat getDepthFormat() const { return mDepthFormat; }
 
-    [[nodiscard]] wgpu::TextureView getCurrentTextureView(wgpu::Extent2D const& extent);
-    [[nodiscard]] wgpu::TextureView getCurrentHeadlessTextureView();
-    [[nodiscard]] wgpu::Texture getCurrentTexture(wgpu::Extent2D const& extent);
+    [[nodiscard]] wgpu::TextureView getNextTextureView();
+    [[nodiscard]] wgpu::TextureView getNextTextureView(wgpu::Extent2D const& extent);
+
+    [[nodiscard]] wgpu::Texture getCurrentTexture();
 
     [[nodiscard]] wgpu::TextureView getDepthTextureView() const { return mDepthTextureView; }
 
@@ -69,7 +70,7 @@ class WebGPUSwapChain final : public Platform::SwapChain, HwSwapChain {
     const SwapChainType mType;
     const uint32_t mHeadlessWidth;
     const uint32_t mHeadlessHeight;
-
+    wgpu::SurfaceTexture mCurrentTexture;
     static constexpr uint32_t mHeadlessBufferCount = 3;
     uint8_t mHeadlessBufferIndex = 0;
     std::array<wgpu::Texture, mHeadlessBufferCount> mRenderTargetTextures;