AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-381627 - Move cl_vk_amd.hpp into rocclr

Browse Source 
Rename VK interop to ExternalMemory object, since it should handle
DX interops also

Change-Id: I536ec46d3e53ece35234a2e29030393ad411b96d


[ROCm/clr commit: 3e5803c4c0]
This commit is contained in:
German Andryeyev
2023-04-19 16:48:00 -04:00
parent a00b618051
commit b2525dfb82
6 changed files with 123 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/device/pal/palmemory.cpp
+7 -5
View File
@@ -34,7 +34,7 @@
#include "platform/interop_d3d11.hpp"
#endif //_WIN32
#include "platform/interop_gl.hpp"
#include "amdocl/cl_vk_amd.hpp"
#include "platform/external_memory.hpp"
#include <string>
#include <fstream>
@@ -241,7 +241,7 @@ bool Memory::createInterop() {
amd::InteropObject* interop = owner()->getInteropObj();
assert((interop != nullptr) && "An invalid interop object is impossible!");
amd::VkObject* vkObject = interop->asVkObject();
auto ext_memory = interop->asExternalMemory();
amd::GLObject* glObject = interop->asGLObject();
#ifdef _WIN32
amd::D3D10Object* d3d10Object = interop->asD3D10Object();
@@ -351,14 +351,16 @@ bool Memory::createInterop() {
}
} else
#endif //_WIN32
if (vkObject != nullptr) {
if (ext_memory != nullptr) {
createParams = &vkRes;
vkRes.owner_ = owner();
memType = Resource::VkInterop;
vkRes.handle_ = vkObject->getVkSharedHandle();
vkRes.handle_ = ext_memory->Handle();
vkRes.type_ = Resource::InteropTypeless;
vkRes.nt_handle_ =
(vkObject->getHandleType() == amd::VkObject::ExternalMemoryWin32) ? true : false;
((ext_memory->Type() != amd::ExternalMemory::HandleType::OpaqueFd) &&
(ext_memory->Type() != amd::ExternalMemory::HandleType::OpaqueWin32Kmt) &&
(ext_memory->Type() != amd::ExternalMemory::HandleType::D3D11ResourceKmt)) ? true : false;
}
else if (glObject != nullptr) {