Skip to content

Commit

Permalink
Updated for validation warning on Windows 10 Anniversary Update 14393
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn committed Aug 2, 2016
1 parent 3e1ad98 commit 3ac2135
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Src/ResourceUploadBatch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ class ResourceUploadBatch::Impl
heap.Get(),
0,
&aliasDescU32,
D3D12_RESOURCE_STATE_COPY_DEST,
D3D12_RESOURCE_STATE_UNORDERED_ACCESS,
nullptr,
IID_GRAPHICS_PPV_ARGS(resourceAliasU32.GetAddressOf())));

Expand Down Expand Up @@ -714,7 +714,7 @@ class ResourceUploadBatch::Impl
AliasBarrier(resourceAliasU32.Get(), resourceAlias8888.Get());

// Transition to pixel shader resource
Transition(resourceAlias8888.Get(), D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
Transition(resourceAlias8888.Get(), D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
}
else
{
Expand Down Expand Up @@ -767,7 +767,7 @@ class ResourceUploadBatch::Impl
}

// Direct copy back
Transition(resourceCopy.Get(), D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_SOURCE);
Transition(resourceCopy.Get(), D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE);
Transition(resource, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST);
mList->CopyResource(resource, resourceCopy.Get());
Transition(resource, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
Expand Down

0 comments on commit 3ac2135

Please sign in to comment.