From 09950676b3f73bb9967aea183d27a30d63098475 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 8 Jul 2021 13:30:17 -0700 Subject: Implement gfx inline ray tracing on D3D12. (#1902) * Update VS projects to 2019. * Empty commit to trigger build * Implement gfx inline ray tracing on D3D12. --- tools/gfx/cuda/render-cuda.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tools/gfx/cuda/render-cuda.cpp') diff --git a/tools/gfx/cuda/render-cuda.cpp b/tools/gfx/cuda/render-cuda.cpp index ffd197e57..2fb8a2ce8 100644 --- a/tools/gfx/cuda/render-cuda.cpp +++ b/tools/gfx/cuda/render-cuda.cpp @@ -239,7 +239,6 @@ public: class CUDAResourceView : public ResourceViewBase { public: - Desc desc; RefPtr memoryResource = nullptr; RefPtr textureResource = nullptr; void* proxyBuffer = nullptr; @@ -447,7 +446,7 @@ public: viewDesc.type = IResourceView::Type::UnorderedAccess; m_bufferView = new CUDAResourceView(); m_bufferView->proxyBuffer = m_cpuBuffer.getBuffer(); - m_bufferView->desc = viewDesc; + m_bufferView->m_desc = viewDesc; } return SLANG_OK; } @@ -466,7 +465,7 @@ public: viewDesc.type = IResourceView::Type::UnorderedAccess; m_bufferView = new CUDAResourceView(); m_bufferView->memoryResource = m_bufferResource; - m_bufferView->desc = viewDesc; + m_bufferView->m_desc = viewDesc; } auto oldSize = m_bufferResource->getDesc()->sizeInBytes; if ((size_t)count != oldSize) @@ -571,7 +570,7 @@ public: if (cudaView->textureResource) { - if (cudaView->desc.type == IResourceView::Type::UnorderedAccess) + if (cudaView->m_desc.type == IResourceView::Type::UnorderedAccess) { auto handle = cudaView->textureResource->m_cudaSurfObj; setData(offset, &handle, sizeof(uint64_t)); @@ -1727,7 +1726,7 @@ public: ITextureResource* texture, IResourceView::Desc const& desc, IResourceView** outView) override { RefPtr view = new CUDAResourceView(); - view->desc = desc; + view->m_desc = desc; view->textureResource = dynamic_cast(texture); returnComPtr(outView, view); return SLANG_OK; @@ -1737,7 +1736,7 @@ public: IBufferResource* buffer, IResourceView::Desc const& desc, IResourceView** outView) override { RefPtr view = new CUDAResourceView(); - view->desc = desc; + view->m_desc = desc; view->memoryResource = dynamic_cast(buffer); returnComPtr(outView, view); return SLANG_OK; -- cgit v1.2.3