Rename ShHandle to Compiler.
Bug 19331817
Change-Id: I0e7b1da2663ccc86e9f9c3501a7fa7567880d3bb
Reviewed-on: https://swiftshader-review.googlesource.com/2150
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/compiler/Compiler.cpp b/src/OpenGL/compiler/Compiler.cpp
index 0086577..ba5d2ae 100644
--- a/src/OpenGL/compiler/Compiler.cpp
+++ b/src/OpenGL/compiler/Compiler.cpp
@@ -8,7 +8,7 @@
#include "Initialize.h"
#include "InitializeParseContext.h"
#include "ParseHelper.h"
-#include "ShHandle.h"
+#include "Compiler.h"
#include "ValidateLimitations.h"
namespace
diff --git a/src/OpenGL/compiler/ShHandle.h b/src/OpenGL/compiler/Compiler.h
similarity index 100%
rename from src/OpenGL/compiler/ShHandle.h
rename to src/OpenGL/compiler/Compiler.h
diff --git a/src/OpenGL/compiler/Compiler.vcxproj b/src/OpenGL/compiler/Compiler.vcxproj
index 8e0780a..9b58fb0 100644
--- a/src/OpenGL/compiler/Compiler.vcxproj
+++ b/src/OpenGL/compiler/Compiler.vcxproj
@@ -296,6 +296,7 @@
<ClInclude Include="AnalyzeCallDepth.h" />
<ClInclude Include="BaseTypes.h" />
<ClInclude Include="Common.h" />
+ <ClInclude Include="Compiler.h" />
<ClInclude Include="ConstantUnion.h" />
<ClInclude Include="debug.h" />
<ClInclude Include="Diagnostics.h" />
@@ -312,7 +313,6 @@
<ClInclude Include="ParseHelper.h" />
<ClInclude Include="PoolAlloc.h" />
<ClInclude Include="Pragma.h" />
- <ClInclude Include="ShHandle.h" />
<ClInclude Include="SymbolTable.h" />
<ClInclude Include="TranslatorASM.h" />
<ClInclude Include="Types.h" />
diff --git a/src/OpenGL/compiler/Compiler.vcxproj.filters b/src/OpenGL/compiler/Compiler.vcxproj.filters
index 09f3041..f25aff3 100644
--- a/src/OpenGL/compiler/Compiler.vcxproj.filters
+++ b/src/OpenGL/compiler/Compiler.vcxproj.filters
@@ -133,9 +133,6 @@
<ClInclude Include="PoolAlloc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ShHandle.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="SymbolTable.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -172,6 +169,9 @@
<ClInclude Include="AnalyzeCallDepth.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="Compiler.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="glslang.l">
diff --git a/src/OpenGL/compiler/Initialize.h b/src/OpenGL/compiler/Initialize.h
index fc7cc30..30cad17 100644
--- a/src/OpenGL/compiler/Initialize.h
+++ b/src/OpenGL/compiler/Initialize.h
@@ -8,7 +8,7 @@
#define _INITIALIZE_INCLUDED_
#include "Common.h"
-#include "ShHandle.h"
+#include "Compiler.h"
#include "SymbolTable.h"
void InsertBuiltInFunctions(ShShaderType type, const ShBuiltInResources &resources, TSymbolTable &table);
diff --git a/src/OpenGL/compiler/ParseHelper.h b/src/OpenGL/compiler/ParseHelper.h
index 12f9dfb..8df8dcf 100644
--- a/src/OpenGL/compiler/ParseHelper.h
+++ b/src/OpenGL/compiler/ParseHelper.h
@@ -10,7 +10,7 @@
#include "DirectiveHandler.h"
#include "localintermediate.h"
#include "preprocessor/Preprocessor.h"
-#include "ShHandle.h"
+#include "Compiler.h"
#include "SymbolTable.h"
struct TMatrixFields {
diff --git a/src/OpenGL/compiler/ShaderLang.cpp b/src/OpenGL/compiler/ShaderLang.cpp
index 2e6a430..39596e5 100644
--- a/src/OpenGL/compiler/ShaderLang.cpp
+++ b/src/OpenGL/compiler/ShaderLang.cpp
@@ -13,7 +13,7 @@
#include "InitializeDll.h"
#include "preprocessor/length_limits.h"
-#include "ShHandle.h"
+#include "Compiler.h"
#include <limits.h>
diff --git a/src/OpenGL/compiler/TranslatorASM.h b/src/OpenGL/compiler/TranslatorASM.h
index 47fcb10..99f9f3d 100644
--- a/src/OpenGL/compiler/TranslatorASM.h
+++ b/src/OpenGL/compiler/TranslatorASM.h
@@ -12,7 +12,7 @@
#ifndef COMPILER_TRANSLATORASM_H_
#define COMPILER_TRANSLATORASM_H_
-#include "ShHandle.h"
+#include "Compiler.h"
#include "OutputASM.h"
namespace glsl