summaryrefslogtreecommitdiffstats
path: root/tools/gfx/d3d12/d3d12-device.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2022-08-10 10:04:06 -0400
committerGitHub <noreply@github.com>2022-08-10 10:04:06 -0400
commit1378fffd9da094beb41b2db89b96f556c23ab6cb (patch)
treee0558c031bd4b1a013dc56b75c4caa3ff5442021 /tools/gfx/d3d12/d3d12-device.cpp
parent89083c4b50af8e48e70b25b63cc62aca21ab706c (diff)
Artifact and ICastable (#2351)
* #include an absolute path didn't work - because paths were taken to always be relative. * WIP with hierarchical enums. * Some small fixes and improvements around artifact desc related types. * Improvements around hierarchical enum. * Fixes to get Artifact types refactor to be able to execute tests. * Attempt to better categorize PTX. * Work around for potentially unused function warning. * Typo fix. * Simplify Artifact header. * Small improvements around Artifact kind/payload/style. * Added IDestroyable/ICastable * Add IArtifactList. * First impl of IArtifactUtil. * Use the ICastable interface for IArtifactRepresentation. * Added IArtifactRepresentation & IArtifactAssociated. * Add SLANG_OVERRIDE to avoid gcc/clang warning. * Fix calling convention issue on win32. * Fix missing SLANG_OVERRIDE. * First attempt at file abstraction around Artifact. * Added creation of lock file. * Move functionality for determining file paths to the IArtifactUtil. Add casting to ICastable. * Added some casting/finding mechanisms. * Simplify IArtifact interface, and use Items for file reps. * Fix problem with libraries on DXIL. * Split out ArtifactRepresentation. * Move ArtifactDesc functionality to ArtifactDescUtil. ArtifactInfoUtil becomes ArtifactDescUtil. * Split implementations from the interfaces for Artifact. * Use TypeTextUtil for target name outputting. * Add artifact impls. * Add ICastableList * Added UnknownCastableAdapter * Make ISlangSharedLibrary derive from ICastable, and remain backwards compatible with slang-llvm. * Refactor Representation on Artifact. * Make our ISlangBlobs also derive from ICastable. Make ISlangBlob atomic ref counted. * Fix typo.
Diffstat (limited to 'tools/gfx/d3d12/d3d12-device.cpp')
-rw-r--r--tools/gfx/d3d12/d3d12-device.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp
index 3578729d9..f5c457809 100644
--- a/tools/gfx/d3d12/d3d12-device.cpp
+++ b/tools/gfx/d3d12/d3d12-device.cpp
@@ -231,10 +231,14 @@ Result DeviceImpl::captureTextureToSurface(
SLANG_RETURN_ON_FAIL(dxResource->Map(0, &readRange, reinterpret_cast<void**>(&data)));
- RefPtr<Slang::ListBlob> resultBlob = new Slang::ListBlob();
- resultBlob->m_data.setCount(bufferSize);
- memcpy(resultBlob->m_data.getBuffer(), data, bufferSize);
+ List<uint8_t> blobData;
+
+ blobData.setCount(bufferSize);
+ memcpy(blobData.getBuffer(), data, bufferSize);
dxResource->Unmap(0, nullptr);
+
+ auto resultBlob = Slang::ListBlob::moveCreate(blobData);
+
returnComPtr(outBlob, resultBlob);
return SLANG_OK;
}
@@ -1748,7 +1752,7 @@ Result DeviceImpl::readBufferResource(
buffer->getDesc()->memoryType != MemoryType::ReadBack ? stageBuf : resource;
// Map and copy
- RefPtr<ListBlob> blob = new ListBlob();
+ List<uint8_t> blobData;
{
UINT8* data;
D3D12_RANGE readRange = { 0, size };
@@ -1757,11 +1761,12 @@ Result DeviceImpl::readBufferResource(
stageBufRef.getResource()->Map(0, &readRange, reinterpret_cast<void**>(&data)));
// Copy to memory buffer
- blob->m_data.setCount(size);
- ::memcpy(blob->m_data.getBuffer(), data, size);
+ blobData.setCount(size);
+ ::memcpy(blobData.getBuffer(), data, size);
stageBufRef.getResource()->Unmap(0, nullptr);
}
+ auto blob = ListBlob::moveCreate(blobData);
returnComPtr(outBlob, blob);
return SLANG_OK;
}
@@ -1782,8 +1787,9 @@ Result DeviceImpl::createProgram(
{
if (outDiagnosticBlob && d3dDiagnosticBlob)
{
- RefPtr<StringBlob> diagnosticBlob =
- new StringBlob(String((const char*)d3dDiagnosticBlob->GetBufferPointer()));
+ String diagnostic((const char*)d3dDiagnosticBlob->GetBufferPointer());
+ auto diagnosticBlob = StringBlob::create(diagnostic);
+
returnComPtr(outDiagnosticBlob, diagnosticBlob);
}
return rootShaderLayoutResult;