commit 4cb9a54fc43c1e79862bf6e2e5acb7729d31f79b
author David Neto <dneto@google.com> Wed Jul 06 15:15:18 2016 -0400
committer David Neto <dneto@google.com> Wed Jul 06 15:15:18 2016 -0400
tree 05efbaf3198fafa17e96030cca97b321a38f5fea
parent 4a3e55102aff26faffbc2bb2d836d83e9bbdb561

Changing Vulkan vs. GL doesn't force teardown of glslang

Glslang's builtin function table cache is now sensitive
to the Spv vs. non-Spv and Vulkan vs. GL.
That is https://github.com/KhronosGroup/glslang/issues/166 is fixed.
So now we don't have to tear down Glslang's internal state when
the "message rules" change. That's how Vulkan vs. GL is encoded.

libshaderc_util/include/libshaderc_util/compiler.h

diff --git a/libshaderc_util/include/libshaderc_util/compiler.h b/libshaderc_util/include/libshaderc_util/compiler.h
index 0c19be3..b5f1273 100644
--- a/libshaderc_util/include/libshaderc_util/compiler.h
+++ b/libshaderc_util/include/libshaderc_util/compiler.h
@@ -37,9 +37,7 @@
 //                  remove this class.
 class GlslInitializer {
  public:
-  GlslInitializer() : last_messages_(EShMsgDefault) {
-    glslang::InitializeProcess();
-  }
+  GlslInitializer() { glslang::InitializeProcess(); }
 
   ~GlslInitializer() { glslang::FinalizeProcess(); }
 
@@ -70,17 +68,8 @@
 
   // Obtains exclusive access to the glslang state. The state remains
   // exclusive until the Initialization Token has been destroyed.
-  // Re-initializes glsl state iff the previous messages and the current
-  // messages are incompatible.
-  InitializationToken Acquire(EShMessages new_messages) {
+  InitializationToken Acquire() {
     state_lock_.lock();
-
-    if ((last_messages_ ^ new_messages) &
-        (EShMsgVulkanRules | EShMsgSpvRules)) {
-      glslang::FinalizeProcess();
-      glslang::InitializeProcess();
-    }
-    last_messages_ = new_messages;
     return InitializationToken(this);
   }
 
@@ -89,7 +78,6 @@
 
   friend class InitializationToken;
 
-  EShMessages last_messages_;
   mutex state_lock_;
 };
 

libshaderc_util/src/compiler.cc

diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
index b7743eb..6ef35c2 100644
--- a/libshaderc_util/src/compiler.cc
+++ b/libshaderc_util/src/compiler.cc
@@ -87,7 +87,7 @@
   std::vector<uint32_t>& compilation_output_data = std::get<1>(result_tuple);
   size_t& compilation_output_data_size_in_bytes = std::get<2>(result_tuple);
 
-  auto token = initializer->Acquire(GetMessageRules());
+  auto token = initializer->Acquire();
   EShLanguage used_shader_stage = forced_shader_stage;
   const std::string macro_definitions =
       shaderc_util::format(predefined_macros_, "#define ", " ", "\n");