Skip to content

Fix atomics resource declaration issue #3833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pow2clk merged 1 commit into from
Jun 23, 2021
Merged

Fix atomics resource declaration issue #3833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tools/clang/test/HLSL/ShaderOpArith.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,12 +1774,12 @@
<Resource Name="U1" Dimension="BUFFER" Width="9216"
Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST"
Init="Zero" ReadBack="true" />
<Resource Name="U2" Dimension="BUFFER" Width="256"
<Resource Name="U2" Dimension="BUFFER" Width="256" Format="R32_TYPELESS"
Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST"
Init="FromBytes" ReadBack="true">
{ 0I, 0I, 99999999I, 99999999I, 0I, 0I, -1I, -1I, 0I, 0I, 0I, 0I, 42I, 42I, 42I, 42I }
</Resource>
<Resource Name="U3" Dimension="BUFFER" Width="1024"
<Resource Name="U3" Dimension="BUFFER" Width="1024" Format="R32_TYPELESS"
Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST"
Init="Zero" ReadBack="true" />
<!-- groupshared output buffers -->
Expand Down Expand Up @@ -1852,10 +1852,10 @@
NumElements="8" StructureByteStride="72" />
<Descriptor Name="U1" Kind="UAV" ResName="U1"
NumElements="128" StructureByteStride="72" />
<Descriptor Name="U2" Kind="UAV" ResName="U2"
NumElements="16" StructureByteStride="8" />
<Descriptor Name="U3" Kind="UAV" ResName="U3"
NumElements="128" StructureByteStride="8" />
<Descriptor Name="U2" Kind="UAV" ResName="U2" Flags='RAW' Format="R32_TYPELESS"
NumElements="16" StructureByteStride="0" />
<Descriptor Name="U3" Kind="UAV" ResName="U3" Flags='RAW' Format="R32_TYPELESS"
NumElements="128" StructureByteStride="0" />
<!-- groupshared output buffers -->
<Descriptor Name="U4" Kind="UAV" ResName="U4"
NumElements="8" StructureByteStride="8" />
Expand Down Expand Up @@ -2322,7 +2322,7 @@
<Resource Name="U0" Dimension="BUFFER" Width="2816"
Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST"
Init="Zero" ReadBack="true" />
<Resource Name="U1" Dimension="BUFFER" Width="256"
<Resource Name="U1" Dimension="BUFFER" Width="256" Format="R32_TYPELESS"
Flags="ALLOW_UNORDERED_ACCESS" InitialResourceState="COPY_DEST"
Init="Zero" ReadBack="true" />
<Resource Name="U2" Dimension="BUFFER" Width="256"
Expand All @@ -2340,8 +2340,8 @@
<DescriptorHeap Name="ResHeap" Type="CBV_SRV_UAV">
<Descriptor Name="U0" Kind="UAV" ResName="U0"
NumElements="64" StructureByteStride="44" />
<Descriptor Name="U1" Kind="UAV" ResName="U1"
NumElements="64" StructureByteStride="4" />
<Descriptor Name="U1" Kind="UAV" ResName="U1" Flags='RAW' Format="R32_TYPELESS"
NumElements="64" StructureByteStride="0" />
<Descriptor Name="U2" Kind="UAV" ResName="U2"
NumElements="64" Format="R32_FLOAT" />
<Descriptor Name="U3" Kind="UAV" ResName="U3" Dimension="TEXTURE1D"
Expand Down