summaryrefslogtreecommitdiffstats
path: root/tools/render-test
diff options
context:
space:
mode:
authorZanderMajercik <amajercik@nvidia.com>2022-01-04 11:05:04 -0800
committerGitHub <noreply@github.com>2022-01-04 11:05:04 -0800
commit9d6c7763334908c78027199a0cb1ca3b9841ebab (patch)
treedc75824b08ca23554a0c8e1f98458c103605ebf9 /tools/render-test
parent1a1b2a0de67dccc1102449b8620830131d569cde (diff)
Buffer allocation backend. (#2045)
* removed initialization of upload resource for CPU visible buffers (D3D12, Vulkan) * reverted slang-gfx.h change * declared DescBase::hasCpuAccessFlag() const to make backend changes compile under gcc * commit before checking master branch * commit before merge * commit before checking master * commit before merging upstream * revert vulkan changes * commit before testing on master * commit before merge with master * reverted bad merge changes * reverted more bad merge changes in render-d3d12.cpp * reverted buffer transition in _uploadBufferData * implemented bufferBarrier() in render-d3d12.cpp * reverted uneccesary transition in createBuffer * create staging buffer even when AccessFlag::None passed to D3D11 createBufferResource * renamed AccessFlags to MemoryType Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/render-test')
-rw-r--r--tools/render-test/render-test-main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index 16a725f2b..4893ad890 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -558,7 +558,7 @@ SlangResult RenderTestApp::initialize(
IBufferResource::Desc vertexBufferDesc;
vertexBufferDesc.type = IResource::Type::Buffer;
vertexBufferDesc.sizeInBytes = kVertexCount * sizeof(Vertex);
- vertexBufferDesc.cpuAccessFlags = AccessFlag::Write;
+ vertexBufferDesc.cpuAccessFlags = MemoryType::CpuWrite;
vertexBufferDesc.defaultState = ResourceState::VertexBuffer;
vertexBufferDesc.allowedStates = ResourceStateSet(ResourceState::VertexBuffer);
@@ -909,7 +909,7 @@ Result RenderTestApp::writeBindingOutput(const String& fileName)
const size_t bufferSize = bufferDesc.sizeInBytes;
ComPtr<ISlangBlob> blob;
- if(bufferDesc.cpuAccessFlags & AccessFlag::Read)
+ if(bufferDesc.cpuAccessFlags & MemoryType::CpuRead)
{
// The buffer is already allocated for CPU access, so we can read it back directly.
//
@@ -920,7 +920,7 @@ Result RenderTestApp::writeBindingOutput(const String& fileName)
// The buffer is not CPU-readable, so we will copy it using a staging buffer.
auto stagingBufferDesc = bufferDesc;
- stagingBufferDesc.cpuAccessFlags = AccessFlag::Read;
+ stagingBufferDesc.cpuAccessFlags = MemoryType::CpuRead;
stagingBufferDesc.allowedStates =
ResourceStateSet(ResourceState::CopyDestination, ResourceState::CopySource);
stagingBufferDesc.defaultState = ResourceState::CopyDestination;