mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fixup_sm_60_wording' of https://github.com/sheredom/glslang into sheredom-fixup_sm_60_wording

Browse Source
This commit is contained in:
John Kessenich 2018-03-07 14:20:11 -07:00
commit e62d1baf3a
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Test/hlsl.wavebroadcast.comp
View File

@ -26,28 +26,28 @@ void CSMain(uint3 dti : SV_DispatchThreadID)
data[dti.x].f.xy = WaveReadLaneAt(data[dti.x].f.xy, 13); data[dti.x].f.xy = WaveReadLaneAt(data[dti.x].f.xy, 13);
data[dti.x].f.xyz = WaveReadLaneAt(data[dti.x].f.xyz, 13); data[dti.x].f.xyz = WaveReadLaneAt(data[dti.x].f.xyz, 13);
data[dti.x].d = WaveReadFirstLane(data[dti.x].d); data[dti.x].d = WaveReadLaneFirst(data[dti.x].d);
data[dti.x].d.x = WaveReadFirstLane(data[dti.x].d.x); data[dti.x].d.x = WaveReadLaneFirst(data[dti.x].d.x);
data[dti.x].d.xy = WaveReadFirstLane(data[dti.x].d.xy); data[dti.x].d.xy = WaveReadLaneFirst(data[dti.x].d.xy);
data[dti.x].d.xyz = WaveReadFirstLane(data[dti.x].d.xyz); data[dti.x].d.xyz = WaveReadLaneFirst(data[dti.x].d.xyz);
data[dti.x].u = WaveReadFirstLane(data[dti.x].u); data[dti.x].u = WaveReadLaneFirst(data[dti.x].u);
data[dti.x].u.x = WaveReadFirstLane(data[dti.x].u.x); data[dti.x].u.x = WaveReadLaneFirst(data[dti.x].u.x);
data[dti.x].u.xy = WaveReadFirstLane(data[dti.x].u.xy); data[dti.x].u.xy = WaveReadLaneFirst(data[dti.x].u.xy);
data[dti.x].u.xyz = WaveReadFirstLane(data[dti.x].u.xyz); data[dti.x].u.xyz = WaveReadLaneFirst(data[dti.x].u.xyz);
data[dti.x].i = WaveReadFirstLane(data[dti.x].i); data[dti.x].i = WaveReadLaneFirst(data[dti.x].i);
data[dti.x].i.x = WaveReadFirstLane(data[dti.x].i.x); data[dti.x].i.x = WaveReadLaneFirst(data[dti.x].i.x);
data[dti.x].i.xy = WaveReadFirstLane(data[dti.x].i.xy); data[dti.x].i.xy = WaveReadLaneFirst(data[dti.x].i.xy);
data[dti.x].i.xyz = WaveReadFirstLane(data[dti.x].i.xyz); data[dti.x].i.xyz = WaveReadLaneFirst(data[dti.x].i.xyz);
data[dti.x].f = WaveReadFirstLane(data[dti.x].f); data[dti.x].f = WaveReadLaneFirst(data[dti.x].f);
data[dti.x].f.x = WaveReadFirstLane(data[dti.x].f.x); data[dti.x].f.x = WaveReadLaneFirst(data[dti.x].f.x);
data[dti.x].f.xy = WaveReadFirstLane(data[dti.x].f.xy); data[dti.x].f.xy = WaveReadLaneFirst(data[dti.x].f.xy);
data[dti.x].f.xyz = WaveReadFirstLane(data[dti.x].f.xyz); data[dti.x].f.xyz = WaveReadLaneFirst(data[dti.x].f.xyz);
data[dti.x].d = WaveReadFirstLane(data[dti.x].d); data[dti.x].d = WaveReadLaneFirst(data[dti.x].d);
data[dti.x].d.x = WaveReadFirstLane(data[dti.x].d.x); data[dti.x].d.x = WaveReadLaneFirst(data[dti.x].d.x);
data[dti.x].d.xy = WaveReadFirstLane(data[dti.x].d.xy); data[dti.x].d.xy = WaveReadLaneFirst(data[dti.x].d.xy);
data[dti.x].d.xyz = WaveReadFirstLane(data[dti.x].d.xyz); data[dti.x].d.xyz = WaveReadLaneFirst(data[dti.x].d.xyz);
} }

4
hlsl/hlslParseables.cpp
View File

@ -913,7 +913,7 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{ "WaveActiveAllTrue", "S", "B", "S", "B", EShLangPSCS, false}, { "WaveActiveAllTrue", "S", "B", "S", "B", EShLangPSCS, false},
{ "WaveActiveBallot", "V4", "U", "S", "B", EShLangPSCS, false}, { "WaveActiveBallot", "V4", "U", "S", "B", EShLangPSCS, false},
{ "WaveReadLaneAt", nullptr, nullptr, "SV,S", "DFUI,U", EShLangPSCS, false}, { "WaveReadLaneAt", nullptr, nullptr, "SV,S", "DFUI,U", EShLangPSCS, false},
{ "WaveReadFirstLane", nullptr, nullptr, "SV", "DFUI", EShLangPSCS, false}, { "WaveReadLaneFirst", nullptr, nullptr, "SV", "DFUI", EShLangPSCS, false},
{ "WaveActiveAllEqual", "S", "B", "SV", "DFUI", EShLangPSCS, false}, { "WaveActiveAllEqual", "S", "B", "SV", "DFUI", EShLangPSCS, false},
{ "WaveActiveAllEqualBool", "S", "B", "S", "B", EShLangPSCS, false}, { "WaveActiveAllEqualBool", "S", "B", "S", "B", EShLangPSCS, false},
{ "WaveActiveCountBits", "S", "U", "S", "B", EShLangPSCS, false}, { "WaveActiveCountBits", "S", "U", "S", "B", EShLangPSCS, false},
@ -1282,7 +1282,7 @@ void TBuiltInParseablesHlsl::identifyBuiltIns(int /*version*/, EProfile /*profil
symbolTable.relateToOperator("WaveActiveAnyTrue", EOpSubgroupAny); symbolTable.relateToOperator("WaveActiveAnyTrue", EOpSubgroupAny);
symbolTable.relateToOperator("WaveActiveAllTrue", EOpSubgroupAll); symbolTable.relateToOperator("WaveActiveAllTrue", EOpSubgroupAll);
symbolTable.relateToOperator("WaveActiveBallot", EOpSubgroupBallot); symbolTable.relateToOperator("WaveActiveBallot", EOpSubgroupBallot);
symbolTable.relateToOperator("WaveReadFirstLane", EOpSubgroupBroadcastFirst); symbolTable.relateToOperator("WaveReadLaneFirst", EOpSubgroupBroadcastFirst);
symbolTable.relateToOperator("WaveReadLaneAt", EOpSubgroupShuffle); symbolTable.relateToOperator("WaveReadLaneAt", EOpSubgroupShuffle);
symbolTable.relateToOperator("WaveActiveAllEqual", EOpSubgroupAllEqual); symbolTable.relateToOperator("WaveActiveAllEqual", EOpSubgroupAllEqual);
symbolTable.relateToOperator("WaveActiveAllEqualBool", EOpSubgroupAllEqual); symbolTable.relateToOperator("WaveActiveAllEqualBool", EOpSubgroupAllEqual);