From: Jeff Bolz <jbolz@nvidia.com>
Date: Wed, 26 Sep 2018 16:41:22 +0000 (-0500)
Subject: Update glslang to past the Turing extensions.
X-Git-Tag: upstream/1.3.5~2324^2~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13f7cae9596e7e321432f3f384ab48a0ca74f28d;p=platform%2Fupstream%2FVK-GL-CTS.git

Update glslang to past the Turing extensions.

Change-Id: Ifcc9c1940ac35f9a4c43d6917f643df093dbbb09
Components: Vulkan
(cherry picked from commit 13f3162b7f2fcce56c98394561308dd97e6b8d60)
---

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
old mode 100755
new mode 100644
index 4ccbaf8..83306d2
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -257,7 +257,7 @@ PACKAGES = [
 	GitRepo(
 		"https://github.com/KhronosGroup/glslang.git",
 		None,
-		"d122a72852900eed187fa95bdebf97a70bf6af2",
+		"5ff3c3da3b374a03a5eff96544fcd6678ed575c1",
 		"glslang"),
 	GitRepo(
 		"https://github.com/KhronosGroup/SPIRV-Headers.git",
diff --git a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
index 9b51579..b86acf2 100644
--- a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
+++ b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
@@ -84,7 +84,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[83]; LimitsSizeHelper_s l; };
+struct BuiltInResourceSizeHelper_s	{ int m[92]; LimitsSizeHelper_s l; };
 
 DE_STATIC_ASSERT(sizeof(TLimits)			== sizeof(LimitsSizeHelper_s));
 DE_STATIC_ASSERT(sizeof(TBuiltInResource)	== sizeof(BuiltInResourceSizeHelper_s));
@@ -189,6 +189,15 @@ void getDefaultBuiltInResources (TBuiltInResource* builtin)
 	builtin->maxCullDistances							= 8;
 	builtin->maxCombinedClipAndCullDistances			= 8;
 	builtin->maxSamples									= 4;
+	builtin->maxMeshOutputVerticesNV					= 256;
+	builtin->maxMeshOutputPrimitivesNV					= 256;
+	builtin->maxMeshWorkGroupSizeX_NV					= 32;
+	builtin->maxMeshWorkGroupSizeY_NV					= 1;
+	builtin->maxMeshWorkGroupSizeZ_NV					= 1;
+	builtin->maxTaskWorkGroupSizeX_NV					= 32;
+	builtin->maxTaskWorkGroupSizeY_NV					= 1;
+	builtin->maxTaskWorkGroupSizeZ_NV					= 1;
+	builtin->maxMeshViewCountNV							= 4;
 };
 
 int getNumShaderStages (const std::vector<std::string>* sources)
@@ -243,7 +252,7 @@ EShMessages getCompileFlags (const ShaderBuildOptions& buildOpts, const ShaderLa
 
 bool compileShaderToSpirV (const std::vector<std::string>* sources, const ShaderBuildOptions& buildOptions, const ShaderLanguage shaderLanguage, std::vector<deUint32>* dst, glu::ShaderProgramInfo* buildInfo)
 {
-	TBuiltInResource	builtinRes;
+	TBuiltInResource	builtinRes = {0};
 	const EShMessages	compileFlags	= getCompileFlags(buildOptions, shaderLanguage);
 
 	if (buildOptions.targetVersion >= SPIRV_VERSION_LAST)