Pipeline: Remove hack to disable spirv-opt when debugging
All 3 issues listed have now been fixed.
It is safe to reenable this.
Fixes: b/147726513
Change-Id: Ie76b77cc67f0ab74f45c73da1a998bce5dffd4fa
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48728
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
index 48a98b0..7cb2a2e 100644
--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
@@ -102,15 +102,7 @@
// instructions.
const bool optimize = !dbgctx;
- // TODO(b/147726513): Do not preprocess the shader if we have a debugger
- // context.
- // This is a work-around for the SPIR-V tools incorrectly reporting errors
- // when debug information is provided. This can be removed once the
- // following SPIR-V tools bugs are fixed:
- // https://github.com/KhronosGroup/SPIRV-Tools/issues/3102
- // https://github.com/KhronosGroup/SPIRV-Tools/issues/3103
- // https://github.com/KhronosGroup/SPIRV-Tools/issues/3118
- auto code = dbgctx ? key.getInsns() : preprocessSpirv(key.getInsns(), key.getSpecializationInfo(), optimize);
+ auto code = preprocessSpirv(key.getInsns(), key.getSpecializationInfo(), optimize);
ASSERT(code.size() > 0);
// If the pipeline has specialization constants, assume they're unique and
