WIP: Add VK_EXT_external_memory_metal #2314
Conversation
aitor-lunarg
force-pushed
the
VK_EXT_external_memory_metal
branch
from
a9ffcc4
to
ba02ae0
Compare
aitor-lunarg
force-pushed
the
VK_EXT_external_memory_metal
branch
from
ba02ae0
to
0dbc5be
Compare
| _externalMemoryHandleTypes = handleTypes; | ||
| auto& xmProps = getPhysicalDevice()->getExternalBufferProperties(VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR); | ||
| auto& xmProps = getPhysicalDevice()->getExternalBufferProperties(VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_EXT); | ||
| _requiresDedicatedMemoryAllocation = _requiresDedicatedMemoryAllocation || mvkIsAnyFlagEnabled(xmProps.externalMemoryFeatures, VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT); | ||
| } else { | ||
| setConfigurationResult(reportError(VK_ERROR_FEATURE_NOT_PRESENT, "vkCreateBuffer(): Only external memory handle type VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR is supported.")); |
There was a problem hiding this comment.
nit: VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR usage remaining (ie. KHR not EXT) in the error message, similar issue also on MVKImage::initExternalMemory
There was a problem hiding this comment.
Done, thank you for catching that!
aitor-lunarg
force-pushed
the
VK_EXT_external_memory_metal
branch
from
cd7b8b0
to
e25fc84
Compare
|
|
||
| if ( !mvkIsOnlyAnyFlagEnabled(handleTypes, VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR | VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_KHR) ) { | ||
| setConfigurationResult(reportError(VK_ERROR_INITIALIZATION_FAILED, "vkAllocateMemory(): Only external memory handle types VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR or VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_KHR are supported.")); | ||
| if ( !mvkIsOnlyAnyFlagEnabled(_externalMemoryHandleType, VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_EXT | VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT) ) { |
There was a problem hiding this comment.
VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT case is missing.
There was a problem hiding this comment.
Done, thank you for the catch!
| requiresDedicated = requiresDedicated || mvkIsAnyFlagEnabled(xmProps.externalMemoryFeatures, VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT); | ||
|
|
||
| // Make sure allocation happens at creation time since we may need to export the memory before usage | ||
| ensureMTLBuffer(); |
There was a problem hiding this comment.
ensureMTLBuffer() called, instead of ensureMTLHeap().
There was a problem hiding this comment.
Fixed, thank you for the catch!
aitor-lunarg
force-pushed
the
VK_EXT_external_memory_metal
branch
from
20f34fd
to
1ee5c58
Compare
aitor-lunarg
force-pushed
the
VK_EXT_external_memory_metal
branch
from
1ee5c58
to
016a57a
Compare
| if (mvkIsAnyFlagEnabled(handleTypes, VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR)) { | ||
| auto& xmProps = getPhysicalDevice()->getExternalBufferProperties(VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLBUFFER_BIT_KHR); | ||
| if (mvkIsAnyFlagEnabled(_externalMemoryHandleType, VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT)) { | ||
| auto& xmProps = getPhysicalDevice()->getExternalBufferProperties(VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT); |
There was a problem hiding this comment.
Call to getExternalBufferProperties(VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT) here is not returning _mtlTextureHeapExternalMemoryProperties and causes requiresDedicated to become false. Maybe it should check VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT along with the heap flag to see if getExternalImageProperties should be called instead?
| // We cannot export images that have no Metal counterparts. This is because we are emulating them via multiple MTLTextures | ||
| // and we would require to export multiple MTLTextures. We let them export them as a heap whenever possible. | ||
| if (_pixelFormats.getChromaSubsamplingPlaneCount(format) > 1u) | ||
| return _mtlTextureHeapExternalMemoryProperties; |
There was a problem hiding this comment.
Do you think we should add a case for VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT here, like:
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLHEAP_BIT_EXT:
return _mtlTextureHeapExternalMemoryProperties;
No description provided.