From 2d1739d57a3f25f15093690b5ff853864bfaf6fd Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Fri, 16 Nov 2018 16:04:23 -0500
Subject: [PATCH] Update to newer SPIRV-Tools, including
 VK_EXT_scalar_block_layout

Validator has more refined messages about what kind of block layout
rules have been applied.
---
 Test/baseResults/hlsl.buffer.frag.out | 2 +-
 known_good.json                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out
index 4528d98b0..71393f083 100644
--- a/Test/baseResults/hlsl.buffer.frag.out
+++ b/Test/baseResults/hlsl.buffer.frag.out
@@ -146,7 +146,7 @@ gl_FragCoord origin is upper left
 0:?     'input' ( in 4-component vector of float FragCoord)
 
 error: SPIRV-Tools Validation Errors
-error: Structure id 50 decorated as BufferBlock for variable in Uniform storage class must follow standard storage buffer layout rules: member 7 at offset 128 overlaps previous member ending at offset 171
+error: Structure id 50 decorated as BufferBlock for variable in Uniform storage class must follow relaxed storage buffer layout rules: member 7 at offset 128 overlaps previous member ending at offset 171
   %tbufName = OpTypeStruct %v4float %int %float %float %float %float %float %float %mat3v4float %mat3v4float %mat3v4float %mat3v4float
 
 // Module Version 10000
diff --git a/known_good.json b/known_good.json
index c9a308a2e..d98550791 100755
--- a/known_good.json
+++ b/known_good.json
@@ -5,7 +5,7 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "ab76e332de7a8480c5753b1c63cc6052949df9fc"
+      "commit" : "8e9be303b00ba352ee25dbcd352769641637a853"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
-- 
GitLab