Skip to content

Commit b5f92e2

Browse files
authored
Merge pull request #835 from microsoft/user/amarp/workgraphs
Reverting previous change, since actually it wil be NodeLaunch parameter that'll be lowercase
2 parents 074b27a + 48a1bee commit b5f92e2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Samples/Desktop/preview/D3D12HelloWorkGraphs/D3D12HelloWorkGraphs.hlsl

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static const uint c_numEntryRecords = 4;
5656
// Each thread group sends 2 records to secondNode asking it to do some work.
5757
// --------------------------------------------------------------------------------------------------------------------------------
5858
[Shader("node")]
59-
[NodeLaunch("Broadcasting")]
59+
[NodeLaunch("broadcasting")]
6060
[NodeMaxDispatchGrid(16,1,1)] // Contrived value, input records from the app only top out at grid size of 4.
6161
// This declaration should be as accurate as possible, but not too small (undefined behavior).
6262
[NumThreads(2,1,1)]
@@ -85,7 +85,7 @@ void firstNode(
8585
// Logs to the UAV and then sends a task to thirdNode
8686
// --------------------------------------------------------------------------------------------------------------------------------
8787
[Shader("node")]
88-
[NodeLaunch("Thread")]
88+
[NodeLaunch("thread")]
8989
void secondNode(
9090
ThreadNodeInputRecord<secondNodeInput> inputData,
9191
[MaxRecords(1)] NodeOutput<thirdNodeInput> thirdNode)
@@ -109,7 +109,7 @@ groupshared uint g_sum[c_numEntryRecords];
109109
// The thread group size happens to match this max input array size of 32, but doesn't have to.
110110
// --------------------------------------------------------------------------------------------------------------------------------
111111
[Shader("node")]
112-
[NodeLaunch("Coalescing")]
112+
[NodeLaunch("coalescing")]
113113
[NumThreads(32,1,1)]
114114
void thirdNode(
115115
[MaxRecords(32)] GroupNodeInputRecords<thirdNodeInput> inputData,

Samples/Desktop/preview/D3D12WorkGraphsSandbox/D3D12WorkGraphsSandbox.hlsl

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct interiorRecord2 // just contriving to make it clear the same record doesn
126126

127127

128128
[Shader("node")]
129-
[NodeLaunch("Broadcasting")]
129+
[NodeLaunch("broadcasting")]
130130
[NodeLocalRootArgumentsTableIndex(1)] // fixed table location, others will autopopulate if not specified
131131
[NodeDispatchGrid(10, 10, 10)]
132132
[NumThreads(2,1,1)]
@@ -167,7 +167,7 @@ void firstNode(
167167
}
168168

169169
[Shader("node")]
170-
[NodeLaunch("Thread")]
170+
[NodeLaunch("thread")]
171171
void secondNode()
172172
{
173173
// Accumulate data to UAV
@@ -217,7 +217,7 @@ void thirdNodeAnotherShader(
217217

218218
[Shader("node")]
219219
[NodeIsProgramEntry] // A node can be a program entry even if it is also interior to the graph
220-
[NodeLaunch("Thread")]
220+
[NodeLaunch("thread")]
221221
[NodeMaxRecursionDepth(3)]
222222
void fourthNode(
223223
ThreadNodeInputRecord<interiorRecord2> inputData,
@@ -244,7 +244,7 @@ void fourthNode(
244244
// Here's a node that's disconnected from the others in the graph.
245245
// A single work graph can have disconnected subgraphs that can run in parallel.
246246
[Shader("node")]
247-
[NodeLaunch("Broadcasting")]
247+
[NodeLaunch("broadcasting")]
248248
// NodeMaxDispatchGrid means grid size is in the input record, see SV_DispatchGrid in entryRecord2
249249
[NodeMaxDispatchGrid(100,100,100)] // normally, make this as tightly defined as possible
250250
[NumThreads(1, 1, 1)]

0 commit comments

Comments
 (0)