Cuda interop vk13 #637
Open
Cuda interop vk13 #637
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
-78
to
+126
| inline bool isDedicated() const {return m_dedicated;} | ||
| inline bool isDedicated() const {return m_params.dedicated;} | ||
|
|
||
| //! Returns the size of the memory allocation | ||
| inline size_t getAllocationSize() const {return m_allocationSize;} | ||
| inline size_t getAllocationSize() const {return m_params.allocationSize;} | ||
|
|
||
| //! | ||
| inline core::bitflag<E_MEMORY_ALLOCATE_FLAGS> getAllocateFlags() const { return m_allocateFlags; } | ||
| inline core::bitflag<E_MEMORY_ALLOCATE_FLAGS> getAllocateFlags() const { return m_params.allocateFlags; } | ||
|
|
||
| //! | ||
| inline core::bitflag<E_MEMORY_PROPERTY_FLAGS> getMemoryPropertyFlags() const { return m_memoryPropertyFlags; } | ||
| inline core::bitflag<E_MEMORY_PROPERTY_FLAGS> getMemoryPropertyFlags() const { return m_params.memoryPropertyFlags; } |
There was a problem hiding this comment.
Note to self I'll probably remove all these getters later since we have a struct that we cache
| @@ -111,6 +127,7 @@ class IDeviceMemoryBacked : public IBackendObject | |||
| //! members | |||
| SCachedCreationParams m_cachedCreationParams; | |||
| SDeviceMemoryRequirements m_cachedMemoryReqs; | |||
| void* m_cachedExternalHandle = nullptr; | |||
There was a problem hiding this comment.
what even sets this?
There was a problem hiding this comment.
see #637 (comment), no need for extra member
atkurtul
reviewed
Jan 4, 2024
Comment on lines
+741
to
+745
| uint32_t exportableTypes : 7 = ~0u; | ||
| uint32_t compatibleTypes : 7 = ~0u; | ||
| uint32_t dedicatedOnly : 1 = 0u; | ||
| uint32_t exportable : 1 = ~0u; | ||
| uint32_t importable : 1 = ~0u; |
There was a problem hiding this comment.
C++20, you can slap enums in bitfields now
| case IQueue::FamilyExternal: | ||
| case IQueue::FamilyIgnored: | ||
| case IQueue::FamilyForeign: | ||
| idx |= 1u << 31; |
There was a problem hiding this comment.
this is kinda flaky, cause it relies on my encoding I have that I only use 1 bit for something else, I'd rather do a real switch-case-return (the VK enum)
| @@ -9,7 +9,6 @@ namespace nbl::video | |||
| CVulkanImage::~CVulkanImage() | |||
| { | |||
| preDestroyStep(); | |||
| // don't destroy imported handles | |||
There was a problem hiding this comment.
new text
// e.g. don't destroy imported handles from the same VkInstance (e.g. if hooking into external Vulkan codebase)
// truly EXTERNAL_MEMORY imported handles, do need to be destroyed + CloseHandled (separate thing)
Comment on lines
+170
to
+173
| VkExportMemoryWin32HandleInfoKHR handleInfo = { | ||
| .sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR, | ||
| .dwAccess = GENERIC_ALL, | ||
| }; |
There was a problem hiding this comment.
ifdef win32 around
There was a problem hiding this comment.
src/nbl/video/ILogicalDevice.cpp
Outdated
| else if (stageMask.hasFlags(asset::ACCESS_FLAGS::SHADER_WRITE_BITS) && shaderCapableFamily) | ||
| stageMask ^= asset::ACCESS_FLAGS::SHADER_WRITE_BITS; | ||
| return getSupportedAccessMask(queueFamilyIndex).hasFlags(stageMask); | ||
| VK_ACCESS_SHADER_WRITE_BIT; |
There was a problem hiding this comment.
one stale line leftover?
Comment on lines
-95
to
+100
| inline bool valid() const | ||
| enum Validity | ||
| { | ||
| INVALID, | ||
| VALID, | ||
| WORK_WITHOUT_SYNC, | ||
| }; |
There was a problem hiding this comment.
no, you have a logger for a reason.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Testing
TODO list: