commit 61de11b370f3f6779e037f13019b483c7eba53b5
author Chip Davis <cdavis@codeweavers.com> Sat Sep 19 12:31:59 2020 -0500
committer Chip Davis <cdavis@codeweavers.com> Tue Sep 22 13:15:40 2020 -0500
tree 2ee6c24f5d53f639e94408620ec490d1fb967ddf
parent c312fb37a7edcc9c12153a9f8ec4e3a96353ccac

MVKImage: Correct offset for texel buffers and heaps.

For planes other than 0, we must add the offset of the first
subresource, so the plane is at the correct place in memory.

MoltenVK/MoltenVK/GPUObjects/MVKImage.mm

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
index d314f1e..e615c7f 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
@@ -54,13 +54,13 @@
         } else if (memoryBinding->_mtlTexelBuffer) {
             _mtlTexture = [memoryBinding->_mtlTexelBuffer
                            newTextureWithDescriptor: mtlTexDesc
-                           offset: memoryBinding->_mtlTexelBufferOffset
+                           offset: memoryBinding->_mtlTexelBufferOffset + _subresources[0].layout.offset
                            bytesPerRow: _subresources[0].layout.rowPitch];
         } else if (memoryBinding->_deviceMemory->getMTLHeap() && !_image->getIsDepthStencil()) {
             // Metal support for depth/stencil from heaps is flaky
             _mtlTexture = [memoryBinding->_deviceMemory->getMTLHeap()
                            newTextureWithDescriptor: mtlTexDesc
-                           offset: memoryBinding->getDeviceMemoryOffset()];
+                           offset: memoryBinding->getDeviceMemoryOffset() + _subresources[0].layout.offset];
             if (_image->_isAliasable) { [_mtlTexture makeAliasable]; }
         } else {
             _mtlTexture = [_image->getMTLDevice() newTextureWithDescriptor: mtlTexDesc];