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

Merge pull request #1825 from amdrexu/bugfix

Browse Source 
Change implementation of gl_SIMDGroupSizeAMD
This commit is contained in:
John Kessenich 2019-07-09 00:14:27 -06:00 committed by GitHub
commit 8aa9a7bb8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glslang/MachineIndependent/Initialize.cpp
View File

@ -3838,12 +3838,13 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
} }
// GL_AMD_gcn_shader // GL_AMD_gcn_shader
if (profile != EEsProfile && version >= 450) { if (profile != EEsProfile && version >= 440) {
commonBuiltins.append( commonBuiltins.append(
"float cubeFaceIndexAMD(vec3);" "float cubeFaceIndexAMD(vec3);"
"vec2 cubeFaceCoordAMD(vec3);" "vec2 cubeFaceCoordAMD(vec3);"
"uint64_t timeAMD();" "uint64_t timeAMD();"
"in int gl_SIMDGroupSizeAMD;"
"\n"); "\n");
} }
@ -7752,14 +7753,6 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
s.append(builtInConstant); s.append(builtInConstant);
} }
#ifdef AMD_EXTENSIONS
// GL_AMD_gcn_shader
if (profile != EEsProfile && version >= 450) {
snprintf(builtInConstant, maxSize, "const int gl_SIMDGroupSizeAMD = 64;");
s.append(builtInConstant);
}
#endif
#ifdef NV_EXTENSIONS #ifdef NV_EXTENSIONS
// SPV_NV_mesh_shader // SPV_NV_mesh_shader
if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 320)) { if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 320)) {
@ -7911,6 +7904,7 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
} }
} }
#ifdef AMD_EXTENSIONS #ifdef AMD_EXTENSIONS
if (profile != EEsProfile) { if (profile != EEsProfile) {
symbolTable.setFunctionExtensions("minInvocationsAMD", 1, &E_GL_AMD_shader_ballot); symbolTable.setFunctionExtensions("minInvocationsAMD", 1, &E_GL_AMD_shader_ballot);
@ -7945,6 +7939,9 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
} }
if (profile != EEsProfile) { if (profile != EEsProfile) {
symbolTable.setVariableExtensions("gl_SIMDGroupSizeAMD", 1, &E_GL_AMD_gcn_shader);
SpecialQualifier("gl_SIMDGroupSizeAMD", EvqVaryingIn, EbvSubGroupSize, symbolTable);
symbolTable.setFunctionExtensions("cubeFaceIndexAMD", 1, &E_GL_AMD_gcn_shader); symbolTable.setFunctionExtensions("cubeFaceIndexAMD", 1, &E_GL_AMD_gcn_shader);
symbolTable.setFunctionExtensions("cubeFaceCoordAMD", 1, &E_GL_AMD_gcn_shader); symbolTable.setFunctionExtensions("cubeFaceCoordAMD", 1, &E_GL_AMD_gcn_shader);
symbolTable.setFunctionExtensions("timeAMD", 1, &E_GL_AMD_gcn_shader); symbolTable.setFunctionExtensions("timeAMD", 1, &E_GL_AMD_gcn_shader);