From dda14f6e01e4d2389119e47bb9731f7ec0d7bc11 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Mon, 4 May 2020 12:37:50 +0200 Subject: [PATCH] Update glslang Components: Framework, Vulkan, OpenGL Change-Id: Iae3ab66b64114a79b0ef28b4c4efa610dcdd1ff7 --- external/fetch_sources.py | 2 +- external/openglcts/modules/common/glcSpirvUtils.cpp | 1 + external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/external/fetch_sources.py b/external/fetch_sources.py index 3896b1a..441156c 100644 --- a/external/fetch_sources.py +++ b/external/fetch_sources.py @@ -321,7 +321,7 @@ PACKAGES = [ GitRepo( "https://github.com/KhronosGroup/glslang.git", None, - "ee8e9c15222c2aff93dfea451b1e8a892497ec2d", + "b5f003d7a3ece37db45578a8a3140b370036fc64", "glslang", removeTags = ["master-tot"]), GitRepo( diff --git a/external/openglcts/modules/common/glcSpirvUtils.cpp b/external/openglcts/modules/common/glcSpirvUtils.cpp index ac2f9f8..2fae3c3 100644 --- a/external/openglcts/modules/common/glcSpirvUtils.cpp +++ b/external/openglcts/modules/common/glcSpirvUtils.cpp @@ -189,6 +189,7 @@ void getDefaultBuiltInResources(TBuiltInResource* builtin) builtin->maxTaskWorkGroupSizeY_NV = 1; builtin->maxTaskWorkGroupSizeZ_NV = 1; builtin->maxMeshViewCountNV = 4; + builtin->maxDualSourceDrawBuffersEXT = 1; }; glslang::EShTargetLanguageVersion getSpirvTargetVersion(SpirvVersion version) diff --git a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp index db44758..ad74ff7 100644 --- a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp +++ b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp @@ -80,7 +80,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[92]; LimitsSizeHelper_s l; }; +struct BuiltInResourceSizeHelper_s { int m[93]; LimitsSizeHelper_s l; }; DE_STATIC_ASSERT(sizeof(TLimits) == sizeof(LimitsSizeHelper_s)); DE_STATIC_ASSERT(sizeof(TBuiltInResource) == sizeof(BuiltInResourceSizeHelper_s)); @@ -194,6 +194,7 @@ void getDefaultBuiltInResources (TBuiltInResource* builtin) builtin->maxTaskWorkGroupSizeY_NV = 1; builtin->maxTaskWorkGroupSizeZ_NV = 1; builtin->maxMeshViewCountNV = 4; + builtin->maxDualSourceDrawBuffersEXT = 1; }; int getNumShaderStages (const std::vector* sources) -- 2.7.4