diff options
| author | lucy96chen <47800040+lucy96chen@users.noreply.github.com> | 2021-11-09 11:59:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 11:59:43 -0800 |
| commit | 4d4cd569ad7fcc88693c18f848603f18894e24be (patch) | |
| tree | 4c7fb036eea9e259d1610a933b448a5d0edcd918 /tools/gfx/renderer-shared.cpp | |
| parent | 8fe3f9cd7d664fc98e33cf276427390b42b9b468 (diff) | |
Allow buffers to be shared between D3D12 and CUDA (#2005)
* Added both the SharedHandle struct containing a handle and the API the handle originated from and the getSharedHandle() method to IResource, which returns a Windows system handle for the resource that can then be shared between multiple APIs (currently only fully implemented for D3D12); Added createTextureFromNativeHandle() and createBufferFromNativeHandle() to IDevice, which creates a buffer or texture resource using the provided handle (currently only fully implemented for D3D12); Added createBufferFromSharedHandle() to IDevice, which creates a BufferResource using the provided system handle (currently only fully implemented for the D3D12 to CUDA interface); Provided a proper implementation for CUDADevice::getNativeHandle(); Added several new tests testing the aforementioned implementations; Moved NativeHandle and getNativeHandle() for IBufferResource and ITextureResource up a layer into IResource and renamed to NativeResourceHandle; Modified NativeResourceHandle to be a struct containing the handle and the API it originated from and propagated these changes where appropriate
* Combined all native and shared handle representations into a unified InteropHandle struct which tracks the handle's value and source API; Modified all getNativeHandle() and getSharedHandle() variants to operate on InteropHandle and modified all affected files
* D3D12 buffers and textures are now responsible for closing their shared handles if they exist; Renamed IDevice::getNativeHandle() to getNativeDeviceHandles()
* Fixed getNativeDeviceHandles() in render-cuda to match updated method elsewhere
* Temporarily disabling existingDeviceHandleCUDA and sharedHandleD3D12ToCUDA due to currently unreproducable test failures on TC
Diffstat (limited to 'tools/gfx/renderer-shared.cpp')
| -rw-r--r-- | tools/gfx/renderer-shared.cpp | 61 |
1 files changed, 54 insertions, 7 deletions
diff --git a/tools/gfx/renderer-shared.cpp b/tools/gfx/renderer-shared.cpp index 64f3f318c..7dbee8ed5 100644 --- a/tools/gfx/renderer-shared.cpp +++ b/tools/gfx/renderer-shared.cpp @@ -76,10 +76,18 @@ IResource* BufferResource::getInterface(const Slang::Guid& guid) SLANG_NO_THROW IResource::Type SLANG_MCALL BufferResource::getType() { return m_type; } SLANG_NO_THROW IBufferResource::Desc* SLANG_MCALL BufferResource::getDesc() { return &m_desc; } -Result BufferResource::getNativeHandle(NativeHandle* outHandle) +Result BufferResource::getNativeResourceHandle(InteropHandle* outHandle) { - *outHandle = NULL; - return SLANG_OK; + outHandle->handleValue = 0; + outHandle->api = InteropHandleAPI::Unknown; + return SLANG_FAIL; +} + +Result BufferResource::getSharedHandle(InteropHandle* outHandle) +{ + outHandle->api = InteropHandleAPI::Unknown; + outHandle->handleValue = 0; + return SLANG_FAIL; } IResource* TextureResource::getInterface(const Slang::Guid& guid) @@ -93,9 +101,17 @@ IResource* TextureResource::getInterface(const Slang::Guid& guid) SLANG_NO_THROW IResource::Type SLANG_MCALL TextureResource::getType() { return m_type; } SLANG_NO_THROW ITextureResource::Desc* SLANG_MCALL TextureResource::getDesc() { return &m_desc; } -Result TextureResource::getNativeHandle(NativeHandle* outHandle) +Result TextureResource::getNativeResourceHandle(InteropHandle* outHandle) +{ + outHandle->handleValue = 0; + outHandle->api = InteropHandleAPI::Unknown; + return SLANG_FAIL; +} + +Result TextureResource::getSharedHandle(InteropHandle* outHandle) { - *outHandle = NULL; + outHandle->api = InteropHandleAPI::Unknown; + outHandle->handleValue = 0; return SLANG_OK; } @@ -275,9 +291,8 @@ SLANG_NO_THROW Result SLANG_MCALL RendererBase::initialize(const Desc& desc) return SLANG_OK; } -SLANG_NO_THROW Result SLANG_MCALL RendererBase::getNativeHandle(NativeHandle* outHandle) +SLANG_NO_THROW Result SLANG_MCALL RendererBase::getNativeDeviceHandles(InteropHandles* outHandles) { - *outHandle = {}; return SLANG_OK; } @@ -332,6 +347,38 @@ SLANG_NO_THROW Result SLANG_MCALL RendererBase::getSlangSession(slang::ISession* return SLANG_OK; } +SLANG_NO_THROW Result SLANG_MCALL RendererBase::createTextureFromNativeHandle( + InteropHandle handle, + const ITextureResource::Desc& srcDesc, + ITextureResource** outResource) +{ + SLANG_UNUSED(handle); + SLANG_UNUSED(srcDesc); + SLANG_UNUSED(outResource); + return SLANG_E_NOT_AVAILABLE; +} + +SLANG_NO_THROW Result SLANG_MCALL RendererBase::createBufferFromNativeHandle( + InteropHandle handle, + const IBufferResource::Desc& srcDesc, + IBufferResource** outResource) +{ + SLANG_UNUSED(handle); + SLANG_UNUSED(srcDesc); + SLANG_UNUSED(outResource); + return SLANG_E_NOT_AVAILABLE; +} + +SLANG_NO_THROW Result SLANG_MCALL RendererBase::createBufferFromSharedHandle( + InteropHandle handle, + const IBufferResource::Desc& srcDesc, + IBufferResource** outResource) +{ + SLANG_UNUSED(srcDesc); + SLANG_UNUSED(outResource); + return SLANG_E_NOT_AVAILABLE; +} + SLANG_NO_THROW Result SLANG_MCALL RendererBase::createShaderObject( slang::TypeReflection* type, ShaderObjectContainerType container, |
