From 9d6c7763334908c78027199a0cb1ca3b9841ebab Mon Sep 17 00:00:00 2001 From: ZanderMajercik Date: Tue, 4 Jan 2022 11:05:04 -0800 Subject: 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 --- tools/gfx-unit-test/buffer-barrier-test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/gfx-unit-test/buffer-barrier-test.cpp') diff --git a/tools/gfx-unit-test/buffer-barrier-test.cpp b/tools/gfx-unit-test/buffer-barrier-test.cpp index f11dd1e5b..0103fda4d 100644 --- a/tools/gfx-unit-test/buffer-barrier-test.cpp +++ b/tools/gfx-unit-test/buffer-barrier-test.cpp @@ -32,7 +32,7 @@ namespace gfx_test bufferDesc.format = gfx::Format::Unknown; bufferDesc.elementSize = sizeof(float); bufferDesc.defaultState = unorderedAccess ? ResourceState::UnorderedAccess : ResourceState::ShaderResource; - bufferDesc.cpuAccessFlags = AccessFlag::Write | AccessFlag::Read; + bufferDesc.cpuAccessFlags = MemoryType::GpuOnly; bufferDesc.allowedStates = ResourceStateSet( ResourceState::ShaderResource, ResourceState::CopyDestination, -- cgit v1.2.3