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

Compile out code for GL_EXT_shader_image_int64 for ANGLE (#2463)

Browse Source 
Fixes a crash in ANGLE.

Closes: #2452
This commit is contained in:
Shahbaz Youssefi 2020-11-16 12:22:34 -05:00 committed by GitHub
parent beec2e4a7c
commit 7f6559d280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glslang/MachineIndependent/Initialize.cpp
View File

@ -5436,6 +5436,12 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
"\n"); "\n");
} }
if (version >= 300 /* both ES and non-ES */) {
stageBuiltins[EShLangFragment].append(
"flat in highp uint gl_ViewID_OVR;" // GL_OVR_multiview, GL_OVR_multiview2
"\n");
}
#ifndef GLSLANG_ANGLE #ifndef GLSLANG_ANGLE
// GL_ARB_shader_ballot // GL_ARB_shader_ballot
if (profile != EEsProfile && version >= 450) { if (profile != EEsProfile && version >= 450) {
@ -5707,14 +5713,6 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
commonBuiltins.append("const int gl_StorageSemanticsOutput = 0x1000;\n"); commonBuiltins.append("const int gl_StorageSemanticsOutput = 0x1000;\n");
} }
#endif // !GLSLANG_ANGLE
if (version >= 300 /* both ES and non-ES */) {
stageBuiltins[EShLangFragment].append(
"flat in highp uint gl_ViewID_OVR;" // GL_OVR_multiview, GL_OVR_multiview2
"\n");
}
// Adding these to common built-ins triggers an assert due to a memory corruption in related code when testing // Adding these to common built-ins triggers an assert due to a memory corruption in related code when testing
// So instead add to each stage individually, avoiding the GLSLang bug // So instead add to each stage individually, avoiding the GLSLang bug
if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 310)) { if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 310)) {
@ -5764,6 +5762,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
} }
} }
} }
#endif // !GLSLANG_ANGLE
#endif // !GLSLANG_WEB #endif // !GLSLANG_WEB