summaryrefslogtreecommitdiffstats
path: root/tools/gfx/vulkan
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/vulkan
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/vulkan')
-rw-r--r--tools/gfx/vulkan/vk-device.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/tools/gfx/vulkan/vk-device.cpp b/tools/gfx/vulkan/vk-device.cpp
index d62734394..c2d82f8a7 100644
--- a/tools/gfx/vulkan/vk-device.cpp
+++ b/tools/gfx/vulkan/vk-device.cpp
@@ -797,8 +797,9 @@ SlangResult DeviceImpl::readTextureResource(
Size* outPixelSize)
{
auto textureImpl = static_cast<TextureResourceImpl*>(texture);
- RefPtr<ListBlob> blob = new ListBlob();
+ List<uint8_t> blobData;
+
auto desc = textureImpl->getDesc();
auto width = desc->size.width;
auto height = desc->size.height;
@@ -828,8 +829,8 @@ SlangResult DeviceImpl::readTextureResource(
}
// Calculate the total size taking into account the array
bufferSize *= arraySize;
- // TODO: Change Index to Count?
- blob->m_data.setCount(Index(bufferSize));
+
+ blobData.setCount(Count(bufferSize));
VKBufferHandleRAII staging;
SLANG_RETURN_ON_FAIL(staging.init(
@@ -880,11 +881,14 @@ SlangResult DeviceImpl::readTextureResource(
SLANG_RETURN_ON_FAIL(
m_api.vkMapMemory(m_device, staging.m_memory, 0, bufferSize, 0, &mappedData));
- ::memcpy(blob->m_data.getBuffer(), mappedData, bufferSize);
+ ::memcpy(blobData.getBuffer(), mappedData, bufferSize);
m_api.vkUnmapMemory(m_device, staging.m_memory);
*outPixelSize = pixelSize;
*outRowPitch = rowPitch;
+
+ auto blob = ListBlob::moveCreate(blobData);
+
returnComPtr(outBlob, blob);
return SLANG_OK;
}
@@ -894,8 +898,9 @@ SlangResult DeviceImpl::readBufferResource(
{
BufferResourceImpl* buffer = static_cast<BufferResourceImpl*>(inBuffer);
- RefPtr<ListBlob> blob = new ListBlob();
- blob->m_data.setCount(size);
+ List<uint8_t> blobData;
+
+ blobData.setCount(size);
// create staging buffer
VKBufferHandleRAII staging;
@@ -920,9 +925,11 @@ SlangResult DeviceImpl::readBufferResource(
void* mappedData = nullptr;
SLANG_RETURN_ON_FAIL(m_api.vkMapMemory(m_device, staging.m_memory, 0, size, 0, &mappedData));
- ::memcpy(blob->m_data.getBuffer(), mappedData, size);
+ ::memcpy(blobData.getBuffer(), mappedData, size);
m_api.vkUnmapMemory(m_device, staging.m_memory);
+ auto blob = ListBlob::moveCreate(blobData);
+
returnComPtr(outBlob, blob);
return SLANG_OK;
}