Rename GlslInitialzer -> GlslangInitializer
diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
index 4702608..8a2f46a 100644
--- a/libshaderc/src/shaderc.cc
+++ b/libshaderc/src/shaderc.cc
@@ -338,8 +338,8 @@
}
shaderc_compiler_t shaderc_compiler_initialize() {
- static shaderc_util::GlslInitializer* initializer =
- new shaderc_util::GlslInitializer;
+ static shaderc_util::GlslangInitializer* initializer =
+ new shaderc_util::GlslangInitializer;
shaderc_compiler_t compiler = new (std::nothrow) shaderc_compiler;
compiler->initializer = initializer;
return compiler;
diff --git a/libshaderc/src/shaderc_private.h b/libshaderc/src/shaderc_private.h
index a11d449..de8fd07 100644
--- a/libshaderc/src/shaderc_private.h
+++ b/libshaderc/src/shaderc_private.h
@@ -84,11 +84,11 @@
};
namespace shaderc_util {
-class GlslInitializer;
+class GlslangInitializer;
}
struct shaderc_compiler {
- shaderc_util::GlslInitializer* initializer;
+ shaderc_util::GlslangInitializer* initializer;
};
#endif // LIBSHADERC_SRC_SHADERC_PRIVATE_H_
diff --git a/libshaderc_util/include/libshaderc_util/compiler.h b/libshaderc_util/include/libshaderc_util/compiler.h
index bbddca5..f774007 100644
--- a/libshaderc_util/include/libshaderc_util/compiler.h
+++ b/libshaderc_util/include/libshaderc_util/compiler.h
@@ -39,11 +39,11 @@
// glslang state can be correctly handled.
// TODO(awoloszyn): Once glslang no longer has static global mutable state
// remove this class.
-class GlslInitializer {
+class GlslangInitializer {
public:
- GlslInitializer() { glslang::InitializeProcess(); }
+ GlslangInitializer() { glslang::InitializeProcess(); }
- ~GlslInitializer() { glslang::FinalizeProcess(); }
+ ~GlslangInitializer() { glslang::FinalizeProcess(); }
// Calls release on GlslangInitializer used to intialize this object
// when it is destroyed.
@@ -63,11 +63,11 @@
InitializationToken(const InitializationToken&) = delete;
private:
- InitializationToken(GlslInitializer* initializer)
+ InitializationToken(GlslangInitializer* initializer)
: initializer_(initializer) {}
- friend class GlslInitializer;
- GlslInitializer* initializer_;
+ friend class GlslangInitializer;
+ GlslangInitializer* initializer_;
};
// Obtains exclusive access to the glslang state. The state remains
@@ -163,7 +163,7 @@
// from the shader text. Any #include directives are parsed with the given
// includer.
//
- // The initializer parameter must be a valid GlslInitializer object.
+ // The initializer parameter must be a valid GlslangInitializer object.
// Acquire will be called on the initializer and the result will be
// destoryed before the function ends.
//
@@ -190,7 +190,7 @@
stage_callback,
CountingIncluder& includer, OutputType output_type,
std::ostream* error_stream, size_t* total_warnings, size_t* total_errors,
- GlslInitializer* initializer) const;
+ GlslangInitializer* initializer) const;
static EShMessages GetDefaultRules() {
return static_cast<EShMessages>(EShMsgSpvRules | EShMsgVulkanRules |
diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
index 686f78f..b3c0a4f 100644
--- a/libshaderc_util/src/compiler.cc
+++ b/libshaderc_util/src/compiler.cc
@@ -91,7 +91,7 @@
stage_callback,
CountingIncluder& includer, OutputType output_type,
std::ostream* error_stream, size_t* total_warnings, size_t* total_errors,
- GlslInitializer* initializer) const {
+ GlslangInitializer* initializer) const {
// Compilation results to be returned:
// Initialize the result tuple as a failed compilation. In error cases, we
// should return result_tuple directly without setting its members.
diff --git a/libshaderc_util/src/compiler_test.cc b/libshaderc_util/src/compiler_test.cc
index b11e04b..957f8f3 100644
--- a/libshaderc_util/src/compiler_test.cc
+++ b/libshaderc_util/src/compiler_test.cc
@@ -107,7 +107,7 @@
std::stringstream errors;
size_t total_warnings = 0;
size_t total_errors = 0;
- shaderc_util::GlslInitializer initializer;
+ shaderc_util::GlslangInitializer initializer;
bool result = false;
DummyCountingIncluder dummy_includer;
std::tie(result, std::ignore, std::ignore) = compiler_.Compile(
