From b44dac19682f38ad8a44d4617ba09e6a18f107e0 Mon Sep 17 00:00:00 2001
From: Greg Fischer <greg@lunarg.com>
Date: Thu, 24 Oct 2019 10:37:01 -0600
Subject: [PATCH] Update spirv-tools known good.

---
 SPIRV/SpvTools.cpp | 3 +--
 known_good.json    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
index 698f154a..7c3b0391 100644
--- a/SPIRV/SpvTools.cpp
+++ b/SPIRV/SpvTools.cpp
@@ -173,6 +173,7 @@ void SpirvToolsLegalize(const glslang::TIntermediate&, std::vector<unsigned int>
     if (options->generateDebugInfo) {
         optimizer.RegisterPass(spvtools::CreatePropagateLineInfoPass());
     }
+    optimizer.RegisterPass(spvtools::CreateWrapOpKillPass());
     optimizer.RegisterPass(spvtools::CreateDeadBranchElimPass());
     optimizer.RegisterPass(spvtools::CreateMergeReturnPass());
     optimizer.RegisterPass(spvtools::CreateInlineExhaustivePass());
@@ -196,8 +197,6 @@ void SpirvToolsLegalize(const glslang::TIntermediate&, std::vector<unsigned int>
     optimizer.RegisterPass(spvtools::CreateDeadInsertElimPass());
     if (options->optimizeSize) {
         optimizer.RegisterPass(spvtools::CreateRedundancyEliminationPass());
-        // TODO(greg-lunarg): Add this when AMD driver issues are resolved
-        // optimizer.RegisterPass(CreateCommonUniformElimPass());
     }
     optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());
     optimizer.RegisterPass(spvtools::CreateCFGCleanupPass());
diff --git a/known_good.json b/known_good.json
index 3d8994a6..8bb70535 100644
--- a/known_good.json
+++ b/known_good.json
@@ -5,14 +5,14 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "c3ca04741945c332ddbeb7d7125dbae2809b7195"
+      "commit" : "02910ffdffaa2966f613ede0c516645f5555c13c"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Headers",
       "subdir" : "External/spirv-tools/external/spirv-headers",
-      "commit" : "b252a50953ac4375cb1864e94f4b0234db9d215d"
+      "commit" : "af64a9e826bf5bb5fcd2434dd71be1e41e922563"
     }
   ]
 }