Merged internal pull request "Removed image view creation from copy t…

…exture in vulkan" (!52)
NVIDIAGameWorks · Mar 7, 2024 · cc5531a · cc5531a
2 parents a2e059a + 1ec16be
commit cc5531a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/vulkan/vulkan-texture.cpp b/src/vulkan/vulkan-texture.cpp
@@ -395,14 +395,17 @@ namespace nvrhi::vulkan
             resolvedSrcSlice.arraySlice, 1
         );
 
-        const auto& srcSubresourceView = src->getSubresourceView(srcSubresource, TextureDimension::Unknown, Format::UNKNOWN);
+        auto srcFormat = nvrhi::vulkan::convertFormat(src->desc.format);
+        vk::ImageAspectFlags srcAspectFlags = guessSubresourceImageAspectFlags(vk::Format(srcFormat), nvrhi::vulkan::Texture::TextureSubresourceViewType::AllAspects);
 
         TextureSubresourceSet dstSubresource = TextureSubresourceSet(
             resolvedDstSlice.mipLevel, 1,
             resolvedDstSlice.arraySlice, 1
         );
 
-        const auto& dstSubresourceView = dst->getSubresourceView(dstSubresource, TextureDimension::Unknown, Format::UNKNOWN);
+        auto dstFormat = nvrhi::vulkan::convertFormat(dst->desc.format);
+        vk::ImageAspectFlags dstAspectFlags = guessSubresourceImageAspectFlags(vk::Format(dstFormat), nvrhi::vulkan::Texture::TextureSubresourceViewType::AllAspects);
+
 
         // When copying between block-compressed and uint textures, the extents and offsets are scaled by the block size.
         // To simplify the logic here, assume that one of (src, dst) is compressed, therefore its extents are smaller, and use that.
@@ -414,13 +417,13 @@ namespace nvrhi::vulkan
 
         auto imageCopy = vk::ImageCopy()
                             .setSrcSubresource(vk::ImageSubresourceLayers()
-                                                .setAspectMask(srcSubresourceView.subresourceRange.aspectMask)
+                                                .setAspectMask(srcAspectFlags)
                                                 .setMipLevel(srcSubresource.baseMipLevel)
                                                 .setBaseArrayLayer(srcSubresource.baseArraySlice)
                                                 .setLayerCount(srcSubresource.numArraySlices))
                             .setSrcOffset(vk::Offset3D(resolvedSrcSlice.x, resolvedSrcSlice.y, resolvedSrcSlice.z))
                             .setDstSubresource(vk::ImageSubresourceLayers()
-                                                .setAspectMask(dstSubresourceView.subresourceRange.aspectMask)
+                                                .setAspectMask(dstAspectFlags)
                                                 .setMipLevel(dstSubresource.baseMipLevel)
                                                 .setBaseArrayLayer(dstSubresource.baseArraySlice)
                                                 .setLayerCount(dstSubresource.numArraySlices))