Optimize subresource tracking - use texture view

Bug: dawn:441

Change-Id: I5cdfc1d84b27eb0b127d34ee829ceedf15f1150c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/22321
Commit-Queue: Yunchao He <yunchao.he@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/SwapChain.cpp

@@ -199,7 +199,7 @@ namespace dawn_native {
         }
         ASSERT(!IsError());
 
-        if (GetDevice()->ConsumedError(OnBeforePresent(mCurrentTexture.Get()))) {
+        if (GetDevice()->ConsumedError(OnBeforePresent(mCurrentTextureView.Get()))) {
             return;
         }
 

src/dawn_native/SwapChain.h

@@ -68,7 +68,7 @@ namespace dawn_native {
         ~OldSwapChainBase() override;
         const DawnSwapChainImplementation& GetImplementation();
         virtual TextureBase* GetNextTextureImpl(const TextureDescriptor*) = 0;
-        virtual MaybeError OnBeforePresent(TextureBase* texture) = 0;
+        virtual MaybeError OnBeforePresent(TextureViewBase* view) = 0;
 
       private:
         MaybeError ValidateConfigure(wgpu::TextureFormat format,

src/dawn_native/d3d12/SwapChainD3D12.cpp

@@ -48,14 +48,16 @@ namespace dawn_native { namespace d3d12 {
         return new Texture(ToBackend(GetDevice()), descriptor, std::move(d3d12Texture));
     }
 
-    MaybeError SwapChain::OnBeforePresent(TextureBase* texture) {
+    MaybeError SwapChain::OnBeforePresent(TextureViewBase* view) {
         Device* device = ToBackend(GetDevice());
 
         CommandRecordingContext* commandContext;
         DAWN_TRY_ASSIGN(commandContext, device->GetPendingCommandContext());
 
         // Perform the necessary transition for the texture to be presented.
-        ToBackend(texture)->TrackAllUsageAndTransitionNow(commandContext, mTextureUsage);
+        ToBackend(view->GetTexture())
+            ->TrackUsageAndTransitionNow(commandContext, mTextureUsage,
+                                         view->GetSubresourceRange());
 
         DAWN_TRY(device->ExecutePendingCommandContext());
 

src/dawn_native/d3d12/SwapChainD3D12.h

@@ -28,7 +28,7 @@ namespace dawn_native { namespace d3d12 {
       protected:
         ~SwapChain() override;
         TextureBase* GetNextTextureImpl(const TextureDescriptor* descriptor) override;
-        MaybeError OnBeforePresent(TextureBase* texture) override;
+        MaybeError OnBeforePresent(TextureViewBase* view) override;
 
         wgpu::TextureUsage mTextureUsage;
     };

src/dawn_native/metal/SwapChainMTL.h

@@ -32,7 +32,7 @@ namespace dawn_native { namespace metal {
       protected:
         ~OldSwapChain() override;
         TextureBase* GetNextTextureImpl(const TextureDescriptor* descriptor) override;
-        MaybeError OnBeforePresent(TextureBase* texture) override;
+        MaybeError OnBeforePresent(TextureViewBase* view) override;
     };
 
     class SwapChain final : public NewSwapChainBase {

src/dawn_native/metal/SwapChainMTL.mm

@@ -51,7 +51,7 @@ namespace dawn_native { namespace metal {
         return new Texture(ToBackend(GetDevice()), descriptor, nativeTexture);
     }
 
-    MaybeError OldSwapChain::OnBeforePresent(TextureBase*) {
+    MaybeError OldSwapChain::OnBeforePresent(TextureViewBase*) {
         return {};
     }
 

src/dawn_native/null/DeviceNull.cpp

@@ -443,7 +443,7 @@ namespace dawn_native { namespace null {
         return GetDevice()->CreateTexture(descriptor);
     }
 
-    MaybeError OldSwapChain::OnBeforePresent(TextureBase*) {
+    MaybeError OldSwapChain::OnBeforePresent(TextureViewBase*) {
         return {};
     }
 

src/dawn_native/null/DeviceNull.h

@@ -268,7 +268,7 @@ namespace dawn_native { namespace null {
       protected:
         ~OldSwapChain() override;
         TextureBase* GetNextTextureImpl(const TextureDescriptor* descriptor) override;
-        MaybeError OnBeforePresent(TextureBase*) override;
+        MaybeError OnBeforePresent(TextureViewBase*) override;
     };
 
     class NativeSwapChainImpl {

src/dawn_native/opengl/SwapChainGL.cpp

@@ -44,7 +44,7 @@ namespace dawn_native { namespace opengl {
                            TextureBase::TextureState::OwnedExternal);
     }
 
-    MaybeError SwapChain::OnBeforePresent(TextureBase*) {
+    MaybeError SwapChain::OnBeforePresent(TextureViewBase*) {
         return {};
     }
 

src/dawn_native/opengl/SwapChainGL.h

@@ -30,7 +30,7 @@ namespace dawn_native { namespace opengl {
       protected:
         ~SwapChain() override;
         TextureBase* GetNextTextureImpl(const TextureDescriptor* descriptor) override;
-        MaybeError OnBeforePresent(TextureBase* texture) override;
+        MaybeError OnBeforePresent(TextureViewBase* view) override;
     };
 
 }}  // namespace dawn_native::opengl

src/dawn_native/vulkan/CommandBufferVk.cpp

@@ -153,16 +153,15 @@ namespace dawn_native { namespace vulkan {
                                 break;
 
                             case wgpu::BindingType::ReadonlyStorageTexture:
-                            case wgpu::BindingType::WriteonlyStorageTexture:
+                            case wgpu::BindingType::WriteonlyStorageTexture: {
-                                // TODO (yunchao.he@intel.com): Do the transition for texture's
+                                TextureViewBase* view =
-                                // subresource via its view.
+                                    static_cast<TextureViewBase*>(mBindings[index][bindingIndex]);
-                                ToBackend(
+                                ToBackend(view->GetTexture())
-                                    static_cast<TextureViewBase*>(mBindings[index][bindingIndex])
+                                    ->TransitionUsageNow(recordingContext,
-                                        ->GetTexture())
+                                                         wgpu::TextureUsage::Storage,
-                                    ->TransitionFullUsage(recordingContext,
+                                                         view->GetSubresourceRange());
-                                                          wgpu::TextureUsage::Storage);
                                 break;
-
+                            }
                             case wgpu::BindingType::StorageTexture:
                                 // Not implemented.
 

src/dawn_native/vulkan/SwapChainVk.cpp

@@ -53,13 +53,14 @@ namespace dawn_native { namespace vulkan {
             .Detach();
     }
 
-    MaybeError SwapChain::OnBeforePresent(TextureBase* texture) {
+    MaybeError SwapChain::OnBeforePresent(TextureViewBase* view) {
         Device* device = ToBackend(GetDevice());
 
         // Perform the necessary pipeline barriers for the texture to be used with the usage
         // requested by the implementation.
         CommandRecordingContext* recordingContext = device->GetPendingRecordingContext();
-        ToBackend(texture)->TransitionFullUsage(recordingContext, mTextureUsage);
+        ToBackend(view->GetTexture())
+            ->TransitionUsageNow(recordingContext, mTextureUsage, view->GetSubresourceRange());
 
         DAWN_TRY(device->SubmitPendingCommands());
 

src/dawn_native/vulkan/SwapChainVk.h

@@ -32,7 +32,7 @@ namespace dawn_native { namespace vulkan {
         ~SwapChain() override;
 
         TextureBase* GetNextTextureImpl(const TextureDescriptor* descriptor) override;
-        MaybeError OnBeforePresent(TextureBase* texture) override;
+        MaybeError OnBeforePresent(TextureViewBase* view) override;
 
       private:
         wgpu::TextureUsage mTextureUsage;