From 4bede9eb0018478fb77342e2e22748dfcb3f7a12 Mon Sep 17 00:00:00 2001
From: GregF <greg@LunarG.com>
Date: Mon, 26 Mar 2018 17:20:10 -0600
Subject: [PATCH] Disable DCE by Remapper through glslangValidator...
...now that spirv-opt is capable enough.
---
SPIRV/CMakeLists.txt | 2 +-
SPIRV/GlslangToSpv.cpp | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index b6824192f..f26b5b4e0 100755
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -53,7 +53,7 @@ if(ENABLE_OPT)
PRIVATE ${spirv-tools_SOURCE_DIR}/include
PRIVATE ${spirv-tools_SOURCE_DIR}/source
)
- target_link_libraries(SPIRV glslang SPIRV-Tools-opt SPVRemapper)
+ target_link_libraries(SPIRV glslang SPIRV-Tools-opt)
else()
target_link_libraries(SPIRV glslang)
endif(ENABLE_OPT)
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index d4eaa9021..afd649691 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -57,7 +57,6 @@ namespace spv {
#ifdef ENABLE_OPT
#include "spirv-tools/optimizer.hpp"
#include "message.h"
- #include "SPVRemapper.h"
#endif
#ifdef ENABLE_OPT
@@ -6701,12 +6700,6 @@ void OutputSpvHex(const std::vector<unsigned int>& spirv, const char* baseName,
out.close();
}
-#ifdef ENABLE_OPT
-void errHandler(const std::string& str) {
- std::cerr << str << std::endl;
-}
-#endif
-
//
// Set up the glslang traversal
//
@@ -6781,12 +6774,6 @@ void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsign
if (!optimizer.Run(spirv.data(), spirv.size(), &spirv))
return;
-
- // Remove dead module-level objects: functions, types, vars
- // TODO(greg-lunarg): Switch to spirv-opt versions when available
- spv::spirvbin_t Remapper(0);
- Remapper.registerErrorHandler(errHandler);
- Remapper.remap(spirv, spv::spirvbin_t::DCE_ALL);
}
#endif
--
GitLab