Update to the latest glslang

The fix for glslang#3042 is needed for CTS testing volatile reads from
HelperInvocation.

Change-Id: Ic4f2fca49046c720b33e1b5ce72ec05ef124ac12

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index 96eea75..d4929df 100644 (file)
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -304,7 +304,7 @@ PACKAGES = [
        GitRepo(
                "https://github.com/KhronosGroup/glslang.git",
                "git@github.com:KhronosGroup/glslang.git",
-               "22d39cd684d136a81778cc17a0226ffad40d1cee",
+               "a0ad0d7067521fff880e36acfb8ce453421c3f25",
                "glslang",
                removeTags = ["master-tot"]),
        GitRepo(

diff --git a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
index 7634312..72d85de 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
+++ b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
@@ -88,7 +88,7 @@ void prepareGlslang (void)
 
 // Fail compilation if more members are added to TLimits or TBuiltInResource
 struct LimitsSizeHelper_s                      { bool m0, m1, m2, m3, m4, m5, m6, m7, m8; };
-struct BuiltInResourceSizeHelper_s     { int m[93]; LimitsSizeHelper_s l; };
+struct BuiltInResourceSizeHelper_s     { int m[102]; LimitsSizeHelper_s l; };
 
 DE_STATIC_ASSERT(sizeof(TLimits)                       == sizeof(LimitsSizeHelper_s));
 DE_STATIC_ASSERT(sizeof(TBuiltInResource)      == sizeof(BuiltInResourceSizeHelper_s));
@@ -202,6 +202,15 @@ void getDefaultBuiltInResources (TBuiltInResource* builtin)
        builtin->maxTaskWorkGroupSizeY_NV                                       = 1;
        builtin->maxTaskWorkGroupSizeZ_NV                                       = 1;
        builtin->maxMeshViewCountNV                                                     = 4;
+       builtin->maxMeshOutputVerticesEXT                                       = 256;
+       builtin->maxMeshOutputPrimitivesEXT                                     = 256;
+       builtin->maxMeshWorkGroupSizeX_EXT                                      = 256;
+       builtin->maxMeshWorkGroupSizeY_EXT                                      = 256;
+       builtin->maxMeshWorkGroupSizeZ_EXT                                      = 256;
+       builtin->maxTaskWorkGroupSizeX_EXT                                      = 256;
+       builtin->maxTaskWorkGroupSizeY_EXT                                      = 256;
+       builtin->maxTaskWorkGroupSizeZ_EXT                                      = 256;
+       builtin->maxMeshViewCountEXT                                            = 4;
        builtin->maxDualSourceDrawBuffersEXT                            = 1;
 };