Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #984 from js6i/master

Browse Source 
Images in coherent memory
This commit is contained in:
Bill Hollings 2020-08-05 16:23:18 -04:00 committed by GitHub
commit 15dae8af71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm
View File

@ -93,6 +93,8 @@ void MVKCmdCopyImage<N>::encode(MVKCommandEncoder* cmdEncoder, MVKCommandUse com
VkBufferImageCopy vkDstCopies[copyCnt];
size_t tmpBuffSize = 0;
_srcImage->flushToDevice(0, VK_WHOLE_SIZE);
for (uint32_t copyIdx = 0; copyIdx < copyCnt; copyIdx++) {
auto& vkIC = _vkImageCopies[copyIdx];

1
MoltenVK/MoltenVK/GPUObjects/MVKDeviceMemory.h
View File

@ -148,6 +148,7 @@ public:
protected:
friend class MVKBuffer;
friend class MVKImageMemoryBinding;
friend class MVKImagePlane;
void propagateDebugName() override;
VkDeviceSize adjustMemorySize(VkDeviceSize size, VkDeviceSize offset);

3
MoltenVK/MoltenVK/GPUObjects/MVKImage.h
View File

@ -257,6 +257,9 @@ public:
MVKCommandEncoder* cmdEncoder,
MVKCommandUse cmdUse);
/** Flush underlying buffer memory into the image if necessary */
void flushToDevice(VkDeviceSize offset, VkDeviceSize size);
#pragma mark Metal
/** Returns the Metal texture underlying this image. */

9
MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
View File

@ -178,7 +178,7 @@ void MVKImagePlane::updateMTLTextureContent(MVKImageSubresource& subresource,
VkImageSubresource& imgSubRez = subresource.subresource;
VkSubresourceLayout& imgLayout = subresource.layout;
size = getMemoryBinding()->getDeviceMemory()->adjustMemorySize(size, offset);
// Check if subresource overlaps the memory range.
if ( !overlaps(imgLayout, offset, size) ) { return; }
@ -514,6 +514,13 @@ void MVKImage::propagateDebugName() {
}
}
void MVKImage::flushToDevice(VkDeviceSize offset, VkDeviceSize size) {
for (int bindingIndex = 0; bindingIndex < _memoryBindings.size(); bindingIndex++) {
MVKImageMemoryBinding *binding = _memoryBindings[bindingIndex];
binding->flushToDevice(offset, size);
}
}
VkImageType MVKImage::getImageType() { return mvkVkImageTypeFromMTLTextureType(_mtlTextureType); }
bool MVKImage::getIsDepthStencil() { return getPixelFormats()->getFormatType(_vkFormat) == kMVKFormatDepthStencil; }