Moved the compiler source files into directories based on their project and added a compiler.gypi to generate the compiler projects.
diff --git a/src/build_angle.gypi b/src/build_angle.gypi
index 96f673c..bd5defd 100644
--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -13,223 +13,16 @@
'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }',
],
},
- 'targets': [
- {
- 'target_name': 'preprocessor',
- 'type': 'static_library',
- 'include_dirs': [
- ],
- 'sources': [
- 'compiler/preprocessor/DiagnosticsBase.cpp',
- 'compiler/preprocessor/DiagnosticsBase.h',
- 'compiler/preprocessor/DirectiveHandlerBase.cpp',
- 'compiler/preprocessor/DirectiveHandlerBase.h',
- 'compiler/preprocessor/DirectiveParser.cpp',
- 'compiler/preprocessor/DirectiveParser.h',
- 'compiler/preprocessor/ExpressionParser.cpp',
- 'compiler/preprocessor/ExpressionParser.h',
- 'compiler/preprocessor/Input.cpp',
- 'compiler/preprocessor/Input.h',
- 'compiler/preprocessor/length_limits.h',
- 'compiler/preprocessor/Lexer.cpp',
- 'compiler/preprocessor/Lexer.h',
- 'compiler/preprocessor/Macro.cpp',
- 'compiler/preprocessor/Macro.h',
- 'compiler/preprocessor/MacroExpander.cpp',
- 'compiler/preprocessor/MacroExpander.h',
- 'compiler/preprocessor/numeric_lex.h',
- 'compiler/preprocessor/pp_utils.h',
- 'compiler/preprocessor/Preprocessor.cpp',
- 'compiler/preprocessor/Preprocessor.h',
- 'compiler/preprocessor/SourceLocation.h',
- 'compiler/preprocessor/Token.cpp',
- 'compiler/preprocessor/Token.h',
- 'compiler/preprocessor/Tokenizer.cpp',
- 'compiler/preprocessor/Tokenizer.h',
- ],
- # TODO(jschuh): http://crbug.com/167187
- 'msvs_disabled_warnings': [
- 4267,
- ],
- },
- {
- 'target_name': 'translator_common',
- 'type': 'static_library',
- 'dependencies': ['preprocessor'],
- 'include_dirs': [
- '.',
- '../include',
- ],
- 'defines': [
- 'COMPILER_IMPLEMENTATION',
- ],
- 'sources': [
- 'compiler/BaseTypes.h',
- 'compiler/BlockLayoutEncoder.cpp',
- 'compiler/BlockLayoutEncoder.h',
- 'compiler/BuiltInFunctionEmulator.cpp',
- 'compiler/BuiltInFunctionEmulator.h',
- 'compiler/Common.h',
- 'compiler/Compiler.cpp',
- 'compiler/ConstantUnion.h',
- 'compiler/debug.cpp',
- 'compiler/debug.h',
- 'compiler/DetectCallDepth.cpp',
- 'compiler/DetectCallDepth.h',
- 'compiler/Diagnostics.h',
- 'compiler/Diagnostics.cpp',
- 'compiler/DirectiveHandler.h',
- 'compiler/DirectiveHandler.cpp',
- 'compiler/ExtensionBehavior.h',
- 'compiler/ForLoopUnroll.cpp',
- 'compiler/ForLoopUnroll.h',
- 'compiler/glslang.h',
- 'compiler/glslang_lex.cpp',
- 'compiler/glslang_tab.cpp',
- 'compiler/glslang_tab.h',
- 'compiler/HashNames.h',
- 'compiler/InfoSink.cpp',
- 'compiler/InfoSink.h',
- 'compiler/Initialize.cpp',
- 'compiler/Initialize.h',
- 'compiler/InitializeDll.cpp',
- 'compiler/InitializeDll.h',
- 'compiler/InitializeGlobals.h',
- 'compiler/InitializeGLPosition.cpp',
- 'compiler/InitializeGLPosition.h',
- 'compiler/InitializeParseContext.cpp',
- 'compiler/InitializeParseContext.h',
- 'compiler/Intermediate.cpp',
- 'compiler/intermediate.h',
- 'compiler/intermOut.cpp',
- 'compiler/IntermTraverse.cpp',
- 'compiler/localintermediate.h',
- 'compiler/MapLongVariableNames.cpp',
- 'compiler/MapLongVariableNames.h',
- 'compiler/MMap.h',
- 'compiler/osinclude.h',
- 'compiler/parseConst.cpp',
- 'compiler/ParseHelper.cpp',
- 'compiler/ParseHelper.h',
- 'compiler/PoolAlloc.cpp',
- 'compiler/PoolAlloc.h',
- 'compiler/QualifierAlive.cpp',
- 'compiler/QualifierAlive.h',
- 'compiler/RemoveTree.cpp',
- 'compiler/RemoveTree.h',
- 'compiler/RenameFunction.h',
- 'compiler/ShaderVariable.cpp',
- 'compiler/ShaderVariable.h',
- 'compiler/ShHandle.h',
- 'compiler/SymbolTable.cpp',
- 'compiler/SymbolTable.h',
- 'compiler/Types.h',
- 'compiler/util.cpp',
- 'compiler/util.h',
- 'compiler/ValidateLimitations.cpp',
- 'compiler/ValidateLimitations.h',
- 'compiler/ValidateOutput.cpp',
- 'compiler/ValidateOutput.h',
- 'compiler/VariableInfo.cpp',
- 'compiler/VariableInfo.h',
- 'compiler/VariablePacker.cpp',
- 'compiler/VariablePacker.h',
- # Dependency graph
- 'compiler/depgraph/DependencyGraph.cpp',
- 'compiler/depgraph/DependencyGraph.h',
- 'compiler/depgraph/DependencyGraphBuilder.cpp',
- 'compiler/depgraph/DependencyGraphBuilder.h',
- 'compiler/depgraph/DependencyGraphOutput.cpp',
- 'compiler/depgraph/DependencyGraphOutput.h',
- 'compiler/depgraph/DependencyGraphTraverse.cpp',
- # Timing restrictions
- 'compiler/timing/RestrictFragmentShaderTiming.cpp',
- 'compiler/timing/RestrictFragmentShaderTiming.h',
- 'compiler/timing/RestrictVertexShaderTiming.cpp',
- 'compiler/timing/RestrictVertexShaderTiming.h',
- 'third_party/compiler/ArrayBoundsClamper.cpp',
- 'third_party/compiler/ArrayBoundsClamper.h',
- ],
- 'conditions': [
- ['OS=="win"', {
- # TODO(jschuh): http://crbug.com/167187 size_t -> int
- 'msvs_disabled_warnings': [ 4267 ],
- 'sources': ['compiler/ossource_win.cpp'],
- }, { # else: posix
- 'sources': ['compiler/ossource_posix.cpp'],
- }],
- ],
- },
- {
- 'target_name': 'translator_glsl',
- 'type': '<(component)',
- 'dependencies': ['translator_common'],
- 'include_dirs': [
- '.',
- '../include',
- ],
- 'defines': [
- 'COMPILER_IMPLEMENTATION',
- ],
- 'sources': [
- 'compiler/CodeGenGLSL.cpp',
- 'compiler/OutputESSL.cpp',
- 'compiler/OutputESSL.h',
- 'compiler/OutputGLSLBase.cpp',
- 'compiler/OutputGLSLBase.h',
- 'compiler/OutputGLSL.cpp',
- 'compiler/OutputGLSL.h',
- 'compiler/ShaderLang.cpp',
- 'compiler/TranslatorESSL.cpp',
- 'compiler/TranslatorESSL.h',
- 'compiler/TranslatorGLSL.cpp',
- 'compiler/TranslatorGLSL.h',
- 'compiler/VersionGLSL.cpp',
- 'compiler/VersionGLSL.h',
- ],
- # TODO(jschuh): http://crbug.com/167187 size_t -> int
- 'msvs_disabled_warnings': [ 4267 ],
- },
+ 'includes': [
+ 'compiler.gypi',
],
'conditions': [
['OS=="win"', {
'targets': [
{
- 'target_name': 'translator_hlsl',
- 'type': '<(component)',
- 'dependencies': ['translator_common'],
- 'include_dirs': [
- '.',
- '../include',
- ],
- 'defines': [
- 'COMPILER_IMPLEMENTATION',
- ],
- 'sources': [
- 'compiler/ShaderLang.cpp',
- 'compiler/DetectDiscontinuity.cpp',
- 'compiler/DetectDiscontinuity.h',
- 'compiler/CodeGenHLSL.cpp',
- 'compiler/FlagStd140Structs.cpp',
- 'compiler/FlagStd140Structs.h',
- 'compiler/HLSLLayoutEncoder.cpp',
- 'compiler/HLSLLayoutEncoder.h',
- 'compiler/OutputHLSL.cpp',
- 'compiler/OutputHLSL.h',
- 'compiler/TranslatorHLSL.cpp',
- 'compiler/TranslatorHLSL.h',
- 'compiler/UnfoldShortCircuit.cpp',
- 'compiler/UnfoldShortCircuit.h',
- 'compiler/SearchSymbol.cpp',
- 'compiler/SearchSymbol.h',
- ],
- # TODO(jschuh): http://crbug.com/167187 size_t -> int
- 'msvs_disabled_warnings': [ 4267 ],
- },
- {
'target_name': 'libGLESv2',
'type': 'shared_library',
- 'dependencies': ['translator_hlsl'],
+ 'dependencies': ['translator'],
'include_dirs': [
'.',
'../include',
@@ -245,6 +38,7 @@
'AdditionalDependencies': [
'd3d9.lib',
'dxguid.lib',
+ '%(AdditionalDependencies)',
],
}
},
@@ -267,6 +61,7 @@
'VCLinkerTool': {
'AdditionalDependencies': [
'd3d9.lib',
+ '%(AdditionalDependencies)',
],
}
},
diff --git a/src/common/RefCountObject.cpp b/src/common/RefCountObject.cpp
index 0364adf..c1ef90c 100644
--- a/src/common/RefCountObject.cpp
+++ b/src/common/RefCountObject.cpp
@@ -1,4 +1,3 @@
-#include "precompiled.h"
//
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
diff --git a/src/common/mathutil.cpp b/src/common/mathutil.cpp
index 6a03cb4..9fce00b 100644
--- a/src/common/mathutil.cpp
+++ b/src/common/mathutil.cpp
@@ -1,4 +1,3 @@
-#include "precompiled.h"
//
// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
@@ -8,6 +7,7 @@
// mathutil.cpp: Math and bit manipulation functions.
#include "common/mathutil.h"
+#include <algorithm>
namespace gl
{
diff --git a/src/compiler.gypi b/src/compiler.gypi
new file mode 100644
index 0000000..ff0743a
--- /dev/null
+++ b/src/compiler.gypi
@@ -0,0 +1,44 @@
+# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'targets':
+ [
+ {
+ 'target_name': 'preprocessor',
+ 'type': 'static_library',
+ 'include_dirs': [ ],
+ 'sources': [ '<!@(python enumerate_files.py compiler/preprocessor -types *.cpp *.h)' ],
+ 'msvs_disabled_warnings': [ 4267 ],
+ },
+
+ {
+ 'target_name': 'translator',
+ 'type': 'static_library',
+ 'dependencies': [ 'preprocessor' ],
+ 'include_dirs':
+ [
+ '.',
+ '../include',
+ ],
+ 'defines':
+ [
+ 'COMPILER_IMPLEMENTATION',
+ ],
+ 'sources': [ '<!@(python enumerate_files.py compiler/translator third_party/compiler common -types *.cpp *.h *.y *.l )', ],
+ 'conditions':
+ [
+ ['OS=="win"',
+ {
+ 'msvs_disabled_warnings': [ 4267 ],
+ 'sources/': [ [ 'exclude', 'compiler/translator/ossource_posix.cpp' ], ],
+ },
+ { # else: posix
+ 'sources/': [ [ 'exclude', 'compiler/translator/ossource_win.cpp' ], ],
+ }
+ ],
+ ],
+ },
+ ],
+}
diff --git a/src/compiler/64bit-lexer-safety.patch b/src/compiler/translator/64bit-lexer-safety.patch
similarity index 100%
rename from src/compiler/64bit-lexer-safety.patch
rename to src/compiler/translator/64bit-lexer-safety.patch
diff --git a/src/compiler/BaseTypes.h b/src/compiler/translator/BaseTypes.h
similarity index 100%
rename from src/compiler/BaseTypes.h
rename to src/compiler/translator/BaseTypes.h
diff --git a/src/compiler/BlockLayoutEncoder.cpp b/src/compiler/translator/BlockLayoutEncoder.cpp
similarity index 97%
rename from src/compiler/BlockLayoutEncoder.cpp
rename to src/compiler/translator/BlockLayoutEncoder.cpp
index ca5b471..26d7ba2 100644
--- a/src/compiler/BlockLayoutEncoder.cpp
+++ b/src/compiler/translator/BlockLayoutEncoder.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/BlockLayoutEncoder.h"
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/BlockLayoutEncoder.h"
+#include "compiler/translator/ShaderVariable.h"
#include "common/mathutil.h"
#include "common/utilities.h"
diff --git a/src/compiler/BlockLayoutEncoder.h b/src/compiler/translator/BlockLayoutEncoder.h
similarity index 100%
rename from src/compiler/BlockLayoutEncoder.h
rename to src/compiler/translator/BlockLayoutEncoder.h
diff --git a/src/compiler/BuiltInFunctionEmulator.cpp b/src/compiler/translator/BuiltInFunctionEmulator.cpp
similarity index 98%
rename from src/compiler/BuiltInFunctionEmulator.cpp
rename to src/compiler/translator/BuiltInFunctionEmulator.cpp
index 5e651b7..afbc169 100644
--- a/src/compiler/BuiltInFunctionEmulator.cpp
+++ b/src/compiler/translator/BuiltInFunctionEmulator.cpp
@@ -4,9 +4,9 @@
// found in the LICENSE file.
//
-#include "compiler/BuiltInFunctionEmulator.h"
+#include "compiler/translator/BuiltInFunctionEmulator.h"
-#include "compiler/SymbolTable.h"
+#include "compiler/translator/SymbolTable.h"
namespace {
diff --git a/src/compiler/BuiltInFunctionEmulator.h b/src/compiler/translator/BuiltInFunctionEmulator.h
similarity index 97%
rename from src/compiler/BuiltInFunctionEmulator.h
rename to src/compiler/translator/BuiltInFunctionEmulator.h
index 0d904f4..cfb71a8 100644
--- a/src/compiler/BuiltInFunctionEmulator.h
+++ b/src/compiler/translator/BuiltInFunctionEmulator.h
@@ -9,8 +9,8 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/InfoSink.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/intermediate.h"
//
// This class decides which built-in functions need to be replaced with the
diff --git a/src/compiler/CodeGenGLSL.cpp b/src/compiler/translator/CodeGenGLSL.cpp
similarity index 88%
rename from src/compiler/CodeGenGLSL.cpp
rename to src/compiler/translator/CodeGenGLSL.cpp
index 226bf8f..d0f3b4c 100644
--- a/src/compiler/CodeGenGLSL.cpp
+++ b/src/compiler/translator/CodeGenGLSL.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/TranslatorGLSL.h"
-#include "compiler/TranslatorESSL.h"
+#include "compiler/translator/TranslatorGLSL.h"
+#include "compiler/translator/TranslatorESSL.h"
//
// This function must be provided to create the actual
diff --git a/src/compiler/CodeGenHLSL.cpp b/src/compiler/translator/CodeGenHLSL.cpp
similarity index 93%
rename from src/compiler/CodeGenHLSL.cpp
rename to src/compiler/translator/CodeGenHLSL.cpp
index 637ccc5..c2cf952 100644
--- a/src/compiler/CodeGenHLSL.cpp
+++ b/src/compiler/translator/CodeGenHLSL.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/TranslatorHLSL.h"
+#include "compiler/translator/TranslatorHLSL.h"
//
// This function must be provided to create the actual
diff --git a/src/compiler/Common.h b/src/compiler/translator/Common.h
similarity index 98%
rename from src/compiler/Common.h
rename to src/compiler/translator/Common.h
index 46f9440..f1a67fe 100644
--- a/src/compiler/Common.h
+++ b/src/compiler/translator/Common.h
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#include "compiler/PoolAlloc.h"
+#include "compiler/translator/PoolAlloc.h"
struct TSourceLoc {
int first_file;
diff --git a/src/compiler/Compiler.cpp b/src/compiler/translator/Compiler.cpp
similarity index 93%
rename from src/compiler/Compiler.cpp
rename to src/compiler/translator/Compiler.cpp
index 4afa73d..f8218ed 100644
--- a/src/compiler/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -4,23 +4,23 @@
// found in the LICENSE file.
//
-#include "compiler/BuiltInFunctionEmulator.h"
-#include "compiler/DetectCallDepth.h"
-#include "compiler/ForLoopUnroll.h"
-#include "compiler/Initialize.h"
-#include "compiler/InitializeGLPosition.h"
-#include "compiler/InitializeParseContext.h"
-#include "compiler/MapLongVariableNames.h"
-#include "compiler/ParseHelper.h"
-#include "compiler/RenameFunction.h"
-#include "compiler/ShHandle.h"
-#include "compiler/ValidateLimitations.h"
-#include "compiler/ValidateOutputs.h"
-#include "compiler/VariablePacker.h"
-#include "compiler/depgraph/DependencyGraph.h"
-#include "compiler/depgraph/DependencyGraphOutput.h"
-#include "compiler/timing/RestrictFragmentShaderTiming.h"
-#include "compiler/timing/RestrictVertexShaderTiming.h"
+#include "compiler/translator/BuiltInFunctionEmulator.h"
+#include "compiler/translator/DetectCallDepth.h"
+#include "compiler/translator/ForLoopUnroll.h"
+#include "compiler/translator/Initialize.h"
+#include "compiler/translator/InitializeGLPosition.h"
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/MapLongVariableNames.h"
+#include "compiler/translator/ParseHelper.h"
+#include "compiler/translator/RenameFunction.h"
+#include "compiler/translator/ShHandle.h"
+#include "compiler/translator/ValidateLimitations.h"
+#include "compiler/translator/ValidateOutputs.h"
+#include "compiler/translator/VariablePacker.h"
+#include "compiler/translator/depgraph/DependencyGraph.h"
+#include "compiler/translator/depgraph/DependencyGraphOutput.h"
+#include "compiler/translator/timing/RestrictFragmentShaderTiming.h"
+#include "compiler/translator/timing/RestrictVertexShaderTiming.h"
#include "third_party/compiler/ArrayBoundsClamper.h"
bool isWebGLBasedSpec(ShShaderSpec spec)
diff --git a/src/compiler/ConstantUnion.h b/src/compiler/translator/ConstantUnion.h
similarity index 100%
rename from src/compiler/ConstantUnion.h
rename to src/compiler/translator/ConstantUnion.h
diff --git a/src/compiler/DetectCallDepth.cpp b/src/compiler/translator/DetectCallDepth.cpp
similarity index 97%
rename from src/compiler/DetectCallDepth.cpp
rename to src/compiler/translator/DetectCallDepth.cpp
index 60df52c..bfc1d58 100644
--- a/src/compiler/DetectCallDepth.cpp
+++ b/src/compiler/translator/DetectCallDepth.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/DetectCallDepth.h"
-#include "compiler/InfoSink.h"
+#include "compiler/translator/DetectCallDepth.h"
+#include "compiler/translator/InfoSink.h"
DetectCallDepth::FunctionNode::FunctionNode(const TString& fname)
: name(fname),
diff --git a/src/compiler/DetectCallDepth.h b/src/compiler/translator/DetectCallDepth.h
similarity index 95%
rename from src/compiler/DetectCallDepth.h
rename to src/compiler/translator/DetectCallDepth.h
index 89e85f8..5e7f23d 100644
--- a/src/compiler/DetectCallDepth.h
+++ b/src/compiler/translator/DetectCallDepth.h
@@ -10,8 +10,8 @@
#include "GLSLANG/ShaderLang.h"
#include <limits.h>
-#include "compiler/intermediate.h"
-#include "compiler/VariableInfo.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/VariableInfo.h"
class TInfoSink;
diff --git a/src/compiler/DetectDiscontinuity.cpp b/src/compiler/translator/DetectDiscontinuity.cpp
similarity index 96%
rename from src/compiler/DetectDiscontinuity.cpp
rename to src/compiler/translator/DetectDiscontinuity.cpp
index 7c3b68a..2c013e6 100644
--- a/src/compiler/DetectDiscontinuity.cpp
+++ b/src/compiler/translator/DetectDiscontinuity.cpp
@@ -8,9 +8,9 @@
// gradients of functions with discontinuities.
//
-#include "compiler/DetectDiscontinuity.h"
+#include "compiler/translator/DetectDiscontinuity.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/ParseHelper.h"
namespace sh
{
diff --git a/src/compiler/DetectDiscontinuity.h b/src/compiler/translator/DetectDiscontinuity.h
similarity index 96%
rename from src/compiler/DetectDiscontinuity.h
rename to src/compiler/translator/DetectDiscontinuity.h
index e5520bd..1dd8be9 100644
--- a/src/compiler/DetectDiscontinuity.h
+++ b/src/compiler/translator/DetectDiscontinuity.h
@@ -11,7 +11,7 @@
#ifndef COMPILER_DETECTDISCONTINUITY_H_
#define COMPILER_DETECTDISCONTINUITY_H_
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
namespace sh
{
diff --git a/src/compiler/Diagnostics.cpp b/src/compiler/translator/Diagnostics.cpp
similarity index 91%
rename from src/compiler/Diagnostics.cpp
rename to src/compiler/translator/Diagnostics.cpp
index 540c5d6..71a3d12 100644
--- a/src/compiler/Diagnostics.cpp
+++ b/src/compiler/translator/Diagnostics.cpp
@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
-#include "compiler/Diagnostics.h"
+#include "compiler/translator/Diagnostics.h"
-#include "compiler/debug.h"
-#include "compiler/InfoSink.h"
+#include "compiler/translator/compilerdebug.h"
+#include "compiler/translator/InfoSink.h"
#include "compiler/preprocessor/SourceLocation.h"
TDiagnostics::TDiagnostics(TInfoSink& infoSink) :
diff --git a/src/compiler/Diagnostics.h b/src/compiler/translator/Diagnostics.h
similarity index 100%
rename from src/compiler/Diagnostics.h
rename to src/compiler/translator/Diagnostics.h
diff --git a/src/compiler/DirectiveHandler.cpp b/src/compiler/translator/DirectiveHandler.cpp
similarity index 96%
rename from src/compiler/DirectiveHandler.cpp
rename to src/compiler/translator/DirectiveHandler.cpp
index 64749f3..301a982 100644
--- a/src/compiler/DirectiveHandler.cpp
+++ b/src/compiler/translator/DirectiveHandler.cpp
@@ -4,12 +4,12 @@
// found in the LICENSE file.
//
-#include "compiler/DirectiveHandler.h"
+#include "compiler/translator/DirectiveHandler.h"
#include <sstream>
-#include "compiler/debug.h"
-#include "compiler/Diagnostics.h"
+#include "compiler/translator/compilerdebug.h"
+#include "compiler/translator/Diagnostics.h"
static TBehavior getBehavior(const std::string& str)
{
diff --git a/src/compiler/DirectiveHandler.h b/src/compiler/translator/DirectiveHandler.h
similarity index 93%
rename from src/compiler/DirectiveHandler.h
rename to src/compiler/translator/DirectiveHandler.h
index 76efbfa..69418c2 100644
--- a/src/compiler/DirectiveHandler.h
+++ b/src/compiler/translator/DirectiveHandler.h
@@ -7,8 +7,8 @@
#ifndef COMPILER_DIRECTIVE_HANDLER_H_
#define COMPILER_DIRECTIVE_HANDLER_H_
-#include "compiler/ExtensionBehavior.h"
-#include "compiler/Pragma.h"
+#include "compiler/translator/ExtensionBehavior.h"
+#include "compiler/translator/Pragma.h"
#include "compiler/preprocessor/DirectiveHandlerBase.h"
class TDiagnostics;
diff --git a/src/compiler/ExtensionBehavior.h b/src/compiler/translator/ExtensionBehavior.h
similarity index 100%
rename from src/compiler/ExtensionBehavior.h
rename to src/compiler/translator/ExtensionBehavior.h
diff --git a/src/compiler/FlagStd140Structs.cpp b/src/compiler/translator/FlagStd140Structs.cpp
similarity index 96%
rename from src/compiler/FlagStd140Structs.cpp
rename to src/compiler/translator/FlagStd140Structs.cpp
index bcf33d2..a751b76 100644
--- a/src/compiler/FlagStd140Structs.cpp
+++ b/src/compiler/translator/FlagStd140Structs.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/FlagStd140Structs.h"
+#include "compiler/translator/FlagStd140Structs.h"
namespace sh
{
diff --git a/src/compiler/FlagStd140Structs.h b/src/compiler/translator/FlagStd140Structs.h
similarity index 95%
rename from src/compiler/FlagStd140Structs.h
rename to src/compiler/translator/FlagStd140Structs.h
index 29ae910..610205e 100644
--- a/src/compiler/FlagStd140Structs.h
+++ b/src/compiler/translator/FlagStd140Structs.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_FLAGSTD140STRUCTS_H_
#define COMPILER_FLAGSTD140STRUCTS_H_
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
namespace sh
{
diff --git a/src/compiler/ForLoopUnroll.cpp b/src/compiler/translator/ForLoopUnroll.cpp
similarity index 98%
rename from src/compiler/ForLoopUnroll.cpp
rename to src/compiler/translator/ForLoopUnroll.cpp
index 27a13ea..89e6f1a 100644
--- a/src/compiler/ForLoopUnroll.cpp
+++ b/src/compiler/translator/ForLoopUnroll.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/ForLoopUnroll.h"
+#include "compiler/translator/ForLoopUnroll.h"
namespace {
diff --git a/src/compiler/ForLoopUnroll.h b/src/compiler/translator/ForLoopUnroll.h
similarity index 95%
rename from src/compiler/ForLoopUnroll.h
rename to src/compiler/translator/ForLoopUnroll.h
index e800e25..266e2be 100644
--- a/src/compiler/ForLoopUnroll.h
+++ b/src/compiler/translator/ForLoopUnroll.h
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
struct TLoopIndexInfo {
int id;
diff --git a/src/compiler/HLSLLayoutEncoder.cpp b/src/compiler/translator/HLSLLayoutEncoder.cpp
similarity index 97%
rename from src/compiler/HLSLLayoutEncoder.cpp
rename to src/compiler/translator/HLSLLayoutEncoder.cpp
index f52dc24..31656f9 100644
--- a/src/compiler/HLSLLayoutEncoder.cpp
+++ b/src/compiler/translator/HLSLLayoutEncoder.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/HLSLLayoutEncoder.h"
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/HLSLLayoutEncoder.h"
+#include "compiler/translator/ShaderVariable.h"
#include "common/mathutil.h"
#include "common/utilities.h"
diff --git a/src/compiler/HLSLLayoutEncoder.h b/src/compiler/translator/HLSLLayoutEncoder.h
similarity index 96%
rename from src/compiler/HLSLLayoutEncoder.h
rename to src/compiler/translator/HLSLLayoutEncoder.h
index f72df57..95bbb27 100644
--- a/src/compiler/HLSLLayoutEncoder.h
+++ b/src/compiler/translator/HLSLLayoutEncoder.h
@@ -7,7 +7,7 @@
#ifndef TRANSLATOR_HLSL_HLSLLAYOUTENCODER_H_
#define TRANSLATOR_HLSL_HLSLLAYOUTENCODER_H_
-#include "compiler/BlockLayoutEncoder.h"
+#include "compiler/translator/BlockLayoutEncoder.h"
namespace sh
{
diff --git a/src/compiler/HashNames.h b/src/compiler/translator/HashNames.h
similarity index 90%
rename from src/compiler/HashNames.h
rename to src/compiler/translator/HashNames.h
index d2141e2..751265b 100644
--- a/src/compiler/HashNames.h
+++ b/src/compiler/translator/HashNames.h
@@ -9,7 +9,7 @@
#include <map>
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
#include "GLSLANG/ShaderLang.h"
#define HASHED_NAME_PREFIX "webgl_"
diff --git a/src/compiler/InfoSink.cpp b/src/compiler/translator/InfoSink.cpp
similarity index 96%
rename from src/compiler/InfoSink.cpp
rename to src/compiler/translator/InfoSink.cpp
index d20a6c0..cd59658 100644
--- a/src/compiler/InfoSink.cpp
+++ b/src/compiler/translator/InfoSink.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/InfoSink.h"
+#include "compiler/translator/InfoSink.h"
void TInfoSinkBase::prefix(TPrefixType p) {
switch(p) {
diff --git a/src/compiler/InfoSink.h b/src/compiler/translator/InfoSink.h
similarity index 98%
rename from src/compiler/InfoSink.h
rename to src/compiler/translator/InfoSink.h
index 6888838..9e60a17 100644
--- a/src/compiler/InfoSink.h
+++ b/src/compiler/translator/InfoSink.h
@@ -8,7 +8,7 @@
#define _INFOSINK_INCLUDED_
#include <math.h>
-#include "compiler/Common.h"
+#include "compiler/translator/Common.h"
// Returns the fractional part of the given floating-point number.
inline float fractionalPart(float f) {
diff --git a/src/compiler/Initialize.cpp b/src/compiler/translator/Initialize.cpp
similarity index 99%
rename from src/compiler/Initialize.cpp
rename to src/compiler/translator/Initialize.cpp
index 9534489..d9766b5 100644
--- a/src/compiler/Initialize.cpp
+++ b/src/compiler/translator/Initialize.cpp
@@ -10,9 +10,9 @@
// built-in functions and operators.
//
-#include "compiler/Initialize.h"
+#include "compiler/translator/Initialize.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources, TSymbolTable &symbolTable)
{
diff --git a/src/compiler/Initialize.h b/src/compiler/translator/Initialize.h
similarity index 84%
rename from src/compiler/Initialize.h
rename to src/compiler/translator/Initialize.h
index 4aa1346..b564286 100644
--- a/src/compiler/Initialize.h
+++ b/src/compiler/translator/Initialize.h
@@ -7,9 +7,9 @@
#ifndef _INITIALIZE_INCLUDED_
#define _INITIALIZE_INCLUDED_
-#include "compiler/Common.h"
-#include "compiler/ShHandle.h"
-#include "compiler/SymbolTable.h"
+#include "compiler/translator/Common.h"
+#include "compiler/translator/ShHandle.h"
+#include "compiler/translator/SymbolTable.h"
void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources, TSymbolTable &table);
diff --git a/src/compiler/InitializeDll.cpp b/src/compiler/translator/InitializeDll.cpp
similarity index 74%
rename from src/compiler/InitializeDll.cpp
rename to src/compiler/translator/InitializeDll.cpp
index 6c7f27f..43f8178 100644
--- a/src/compiler/InitializeDll.cpp
+++ b/src/compiler/translator/InitializeDll.cpp
@@ -4,11 +4,11 @@
// found in the LICENSE file.
//
-#include "compiler/InitializeDll.h"
+#include "compiler/translator/InitializeDll.h"
-#include "compiler/InitializeGlobals.h"
-#include "compiler/InitializeParseContext.h"
-#include "compiler/osinclude.h"
+#include "compiler/translator/InitializeGlobals.h"
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/osinclude.h"
bool InitProcess()
{
diff --git a/src/compiler/InitializeDll.h b/src/compiler/translator/InitializeDll.h
similarity index 100%
rename from src/compiler/InitializeDll.h
rename to src/compiler/translator/InitializeDll.h
diff --git a/src/compiler/InitializeGLPosition.cpp b/src/compiler/translator/InitializeGLPosition.cpp
similarity index 94%
rename from src/compiler/InitializeGLPosition.cpp
rename to src/compiler/translator/InitializeGLPosition.cpp
index e0193e3..49880e1 100644
--- a/src/compiler/InitializeGLPosition.cpp
+++ b/src/compiler/translator/InitializeGLPosition.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/InitializeGLPosition.h"
-#include "compiler/debug.h"
+#include "compiler/translator/InitializeGLPosition.h"
+#include "compiler/translator/compilerdebug.h"
bool InitializeGLPosition::visitAggregate(Visit visit, TIntermAggregate* node)
{
diff --git a/src/compiler/InitializeGLPosition.h b/src/compiler/translator/InitializeGLPosition.h
similarity index 95%
rename from src/compiler/InitializeGLPosition.h
rename to src/compiler/translator/InitializeGLPosition.h
index 1b11075..bdc3208 100644
--- a/src/compiler/InitializeGLPosition.h
+++ b/src/compiler/translator/InitializeGLPosition.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_INITIALIZE_GL_POSITION_H_
#define COMPILER_INITIALIZE_GL_POSITION_H_
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
class InitializeGLPosition : public TIntermTraverser
{
diff --git a/src/compiler/InitializeGlobals.h b/src/compiler/translator/InitializeGlobals.h
similarity index 100%
rename from src/compiler/InitializeGlobals.h
rename to src/compiler/translator/InitializeGlobals.h
diff --git a/src/compiler/InitializeParseContext.cpp b/src/compiler/translator/InitializeParseContext.cpp
similarity index 90%
rename from src/compiler/InitializeParseContext.cpp
rename to src/compiler/translator/InitializeParseContext.cpp
index dfab027..b4defae 100644
--- a/src/compiler/InitializeParseContext.cpp
+++ b/src/compiler/translator/InitializeParseContext.cpp
@@ -4,9 +4,9 @@
// found in the LICENSE file.
//
-#include "compiler/InitializeParseContext.h"
+#include "compiler/translator/InitializeParseContext.h"
-#include "compiler/osinclude.h"
+#include "compiler/translator/osinclude.h"
OS_TLSIndex GlobalParseContextIndex = OS_INVALID_TLS_INDEX;
diff --git a/src/compiler/InitializeParseContext.h b/src/compiler/translator/InitializeParseContext.h
similarity index 100%
rename from src/compiler/InitializeParseContext.h
rename to src/compiler/translator/InitializeParseContext.h
diff --git a/src/compiler/IntermTraverse.cpp b/src/compiler/translator/IntermTraverse.cpp
similarity index 98%
rename from src/compiler/IntermTraverse.cpp
rename to src/compiler/translator/IntermTraverse.cpp
index a13877f..70bd81a 100644
--- a/src/compiler/IntermTraverse.cpp
+++ b/src/compiler/translator/IntermTraverse.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
//
// Traverse the intermediate representation tree, and
diff --git a/src/compiler/Intermediate.cpp b/src/compiler/translator/Intermediate.cpp
similarity index 99%
rename from src/compiler/Intermediate.cpp
rename to src/compiler/translator/Intermediate.cpp
index 21098f0..7c8452c 100644
--- a/src/compiler/Intermediate.cpp
+++ b/src/compiler/translator/Intermediate.cpp
@@ -12,11 +12,11 @@
#include <limits.h>
#include <algorithm>
-#include "compiler/HashNames.h"
-#include "compiler/localintermediate.h"
-#include "compiler/QualifierAlive.h"
-#include "compiler/RemoveTree.h"
-#include "compiler/SymbolTable.h"
+#include "compiler/translator/HashNames.h"
+#include "compiler/translator/localintermediate.h"
+#include "compiler/translator/QualifierAlive.h"
+#include "compiler/translator/RemoveTree.h"
+#include "compiler/translator/SymbolTable.h"
bool CompareStructure(const TType& leftNodeType, ConstantUnion* rightUnionArray, ConstantUnion* leftUnionArray);
diff --git a/src/compiler/MMap.h b/src/compiler/translator/MMap.h
similarity index 100%
rename from src/compiler/MMap.h
rename to src/compiler/translator/MMap.h
diff --git a/src/compiler/MapLongVariableNames.cpp b/src/compiler/translator/MapLongVariableNames.cpp
similarity index 97%
rename from src/compiler/MapLongVariableNames.cpp
rename to src/compiler/translator/MapLongVariableNames.cpp
index a41d20f..b9ec983 100644
--- a/src/compiler/MapLongVariableNames.cpp
+++ b/src/compiler/translator/MapLongVariableNames.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/MapLongVariableNames.h"
+#include "compiler/translator/MapLongVariableNames.h"
namespace {
diff --git a/src/compiler/MapLongVariableNames.h b/src/compiler/translator/MapLongVariableNames.h
similarity index 94%
rename from src/compiler/MapLongVariableNames.h
rename to src/compiler/translator/MapLongVariableNames.h
index d6352ac..e0cdfb1 100644
--- a/src/compiler/MapLongVariableNames.h
+++ b/src/compiler/translator/MapLongVariableNames.h
@@ -9,8 +9,8 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
-#include "compiler/VariableInfo.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/VariableInfo.h"
// This size does not include '\0' in the end.
#define MAX_SHORTENED_IDENTIFIER_SIZE 32
diff --git a/src/compiler/OutputESSL.cpp b/src/compiler/translator/OutputESSL.cpp
similarity index 94%
rename from src/compiler/OutputESSL.cpp
rename to src/compiler/translator/OutputESSL.cpp
index a636c49..65635af 100644
--- a/src/compiler/OutputESSL.cpp
+++ b/src/compiler/translator/OutputESSL.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/OutputESSL.h"
+#include "compiler/translator/OutputESSL.h"
TOutputESSL::TOutputESSL(TInfoSinkBase& objSink,
ShArrayIndexClampingStrategy clampingStrategy,
diff --git a/src/compiler/OutputESSL.h b/src/compiler/translator/OutputESSL.h
similarity index 93%
rename from src/compiler/OutputESSL.h
rename to src/compiler/translator/OutputESSL.h
index 26ef000..8a567fb 100644
--- a/src/compiler/OutputESSL.h
+++ b/src/compiler/translator/OutputESSL.h
@@ -7,7 +7,7 @@
#ifndef CROSSCOMPILERGLSL_OUTPUTESSL_H_
#define CROSSCOMPILERGLSL_OUTPUTESSL_H_
-#include "compiler/OutputGLSLBase.h"
+#include "compiler/translator/OutputGLSLBase.h"
class TOutputESSL : public TOutputGLSLBase
{
diff --git a/src/compiler/OutputGLSL.cpp b/src/compiler/translator/OutputGLSL.cpp
similarity index 95%
rename from src/compiler/OutputGLSL.cpp
rename to src/compiler/translator/OutputGLSL.cpp
index d965d78..de1cd93 100644
--- a/src/compiler/OutputGLSL.cpp
+++ b/src/compiler/translator/OutputGLSL.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/OutputGLSL.h"
+#include "compiler/translator/OutputGLSL.h"
TOutputGLSL::TOutputGLSL(TInfoSinkBase& objSink,
ShArrayIndexClampingStrategy clampingStrategy,
diff --git a/src/compiler/OutputGLSL.h b/src/compiler/translator/OutputGLSL.h
similarity index 93%
rename from src/compiler/OutputGLSL.h
rename to src/compiler/translator/OutputGLSL.h
index 3ae516a..18c0951 100644
--- a/src/compiler/OutputGLSL.h
+++ b/src/compiler/translator/OutputGLSL.h
@@ -7,7 +7,7 @@
#ifndef CROSSCOMPILERGLSL_OUTPUTGLSL_H_
#define CROSSCOMPILERGLSL_OUTPUTGLSL_H_
-#include "compiler/OutputGLSLBase.h"
+#include "compiler/translator/OutputGLSLBase.h"
class TOutputGLSL : public TOutputGLSLBase
{
diff --git a/src/compiler/OutputGLSLBase.cpp b/src/compiler/translator/OutputGLSLBase.cpp
similarity index 99%
rename from src/compiler/OutputGLSLBase.cpp
rename to src/compiler/translator/OutputGLSLBase.cpp
index ec57771..8a2b77a 100644
--- a/src/compiler/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/OutputGLSLBase.h"
-#include "compiler/debug.h"
+#include "compiler/translator/OutputGLSLBase.h"
+#include "compiler/translator/compilerdebug.h"
#include <cfloat>
diff --git a/src/compiler/OutputGLSLBase.h b/src/compiler/translator/OutputGLSLBase.h
similarity index 94%
rename from src/compiler/OutputGLSLBase.h
rename to src/compiler/translator/OutputGLSLBase.h
index d5f6e5c..7555bb1 100644
--- a/src/compiler/OutputGLSLBase.h
+++ b/src/compiler/translator/OutputGLSLBase.h
@@ -9,9 +9,9 @@
#include <set>
-#include "compiler/ForLoopUnroll.h"
-#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/ForLoopUnroll.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/ParseHelper.h"
class TOutputGLSLBase : public TIntermTraverser
{
diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
similarity index 99%
rename from src/compiler/OutputHLSL.cpp
rename to src/compiler/translator/OutputHLSL.cpp
index 0a854c7..e2311b0 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -4,17 +4,17 @@
// found in the LICENSE file.
//
-#include "compiler/OutputHLSL.h"
+#include "compiler/translator/OutputHLSL.h"
#include "common/angleutils.h"
#include "common/utilities.h"
-#include "compiler/debug.h"
-#include "compiler/DetectDiscontinuity.h"
-#include "compiler/InfoSink.h"
-#include "compiler/SearchSymbol.h"
-#include "compiler/UnfoldShortCircuit.h"
-#include "compiler/HLSLLayoutEncoder.h"
-#include "compiler/FlagStd140Structs.h"
+#include "compiler/translator/compilerdebug.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/DetectDiscontinuity.h"
+#include "compiler/translator/SearchSymbol.h"
+#include "compiler/translator/UnfoldShortCircuit.h"
+#include "compiler/translator/HLSLLayoutEncoder.h"
+#include "compiler/translator/FlagStd140Structs.h"
#include <algorithm>
#include <cfloat>
diff --git a/src/compiler/OutputHLSL.h b/src/compiler/translator/OutputHLSL.h
similarity index 97%
rename from src/compiler/OutputHLSL.h
rename to src/compiler/translator/OutputHLSL.h
index ef7a3ec..84e12eb 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/translator/OutputHLSL.h
@@ -15,9 +15,9 @@
#include <GLES3/gl3.h>
#include <GLES2/gl2.h>
-#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/ParseHelper.h"
+#include "compiler/translator/ShaderVariable.h"
namespace sh
{
diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/translator/ParseHelper.cpp
similarity index 99%
rename from src/compiler/ParseHelper.cpp
rename to src/compiler/translator/ParseHelper.cpp
index db9a9cd..7e92ed7 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/translator/ParseHelper.cpp
@@ -4,12 +4,12 @@
// found in the LICENSE file.
//
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/ParseHelper.h"
#include <stdarg.h>
#include <stdio.h>
-#include "compiler/glslang.h"
+#include "compiler/translator/glslang.h"
#include "compiler/preprocessor/SourceLocation.h"
///////////////////////////////////////////////////////////////////////
diff --git a/src/compiler/ParseHelper.h b/src/compiler/translator/ParseHelper.h
similarity index 97%
rename from src/compiler/ParseHelper.h
rename to src/compiler/translator/ParseHelper.h
index 8908e1c..3cd4b91 100644
--- a/src/compiler/ParseHelper.h
+++ b/src/compiler/translator/ParseHelper.h
@@ -6,12 +6,12 @@
#ifndef _PARSER_HELPER_INCLUDED_
#define _PARSER_HELPER_INCLUDED_
-#include "compiler/Diagnostics.h"
-#include "compiler/DirectiveHandler.h"
-#include "compiler/localintermediate.h"
+#include "compiler/translator/Diagnostics.h"
+#include "compiler/translator/DirectiveHandler.h"
+#include "compiler/translator/localintermediate.h"
+#include "compiler/translator/ShHandle.h"
+#include "compiler/translator/SymbolTable.h"
#include "compiler/preprocessor/Preprocessor.h"
-#include "compiler/ShHandle.h"
-#include "compiler/SymbolTable.h"
struct TMatrixFields {
bool wholeRow;
diff --git a/src/compiler/PoolAlloc.cpp b/src/compiler/translator/PoolAlloc.cpp
similarity index 97%
rename from src/compiler/PoolAlloc.cpp
rename to src/compiler/translator/PoolAlloc.cpp
index eb99356..abe7026 100644
--- a/src/compiler/PoolAlloc.cpp
+++ b/src/compiler/translator/PoolAlloc.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/PoolAlloc.h"
+#include "compiler/translator/PoolAlloc.h"
#ifndef _MSC_VER
#include <stdint.h>
@@ -12,8 +12,8 @@
#include <stdio.h>
#include "common/angleutils.h"
-#include "compiler/InitializeGlobals.h"
-#include "compiler/osinclude.h"
+#include "compiler/translator/InitializeGlobals.h"
+#include "compiler/translator/osinclude.h"
OS_TLSIndex PoolIndex = OS_INVALID_TLS_INDEX;
diff --git a/src/compiler/PoolAlloc.h b/src/compiler/translator/PoolAlloc.h
similarity index 100%
rename from src/compiler/PoolAlloc.h
rename to src/compiler/translator/PoolAlloc.h
diff --git a/src/compiler/Pragma.h b/src/compiler/translator/Pragma.h
similarity index 100%
rename from src/compiler/Pragma.h
rename to src/compiler/translator/Pragma.h
diff --git a/src/compiler/QualifierAlive.cpp b/src/compiler/translator/QualifierAlive.cpp
similarity index 96%
rename from src/compiler/QualifierAlive.cpp
rename to src/compiler/translator/QualifierAlive.cpp
index 92a6874..1ba087e 100644
--- a/src/compiler/QualifierAlive.cpp
+++ b/src/compiler/translator/QualifierAlive.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
class TAliveTraverser : public TIntermTraverser {
public:
diff --git a/src/compiler/QualifierAlive.h b/src/compiler/translator/QualifierAlive.h
similarity index 100%
rename from src/compiler/QualifierAlive.h
rename to src/compiler/translator/QualifierAlive.h
diff --git a/src/compiler/RemoveTree.cpp b/src/compiler/translator/RemoveTree.cpp
similarity index 93%
rename from src/compiler/RemoveTree.cpp
rename to src/compiler/translator/RemoveTree.cpp
index a4b8c1e..92e5dbb 100644
--- a/src/compiler/RemoveTree.cpp
+++ b/src/compiler/translator/RemoveTree.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/intermediate.h"
-#include "compiler/RemoveTree.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/RemoveTree.h"
//
// Code to recursively delete the intermediate tree.
diff --git a/src/compiler/RemoveTree.h b/src/compiler/translator/RemoveTree.h
similarity index 100%
rename from src/compiler/RemoveTree.h
rename to src/compiler/translator/RemoveTree.h
diff --git a/src/compiler/RenameFunction.h b/src/compiler/translator/RenameFunction.h
similarity index 95%
rename from src/compiler/RenameFunction.h
rename to src/compiler/translator/RenameFunction.h
index 3908bfd..1f7fb16 100644
--- a/src/compiler/RenameFunction.h
+++ b/src/compiler/translator/RenameFunction.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_RENAME_FUNCTION
#define COMPILER_RENAME_FUNCTION
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
//
// Renames a function, including its declaration and any calls to it.
diff --git a/src/compiler/SearchSymbol.cpp b/src/compiler/translator/SearchSymbol.cpp
similarity index 83%
rename from src/compiler/SearchSymbol.cpp
rename to src/compiler/translator/SearchSymbol.cpp
index 9368f1a..f78c84e 100644
--- a/src/compiler/SearchSymbol.cpp
+++ b/src/compiler/translator/SearchSymbol.cpp
@@ -6,10 +6,10 @@
// SearchSymbol is an AST traverser to detect the use of a given symbol name
//
-#include "compiler/SearchSymbol.h"
+#include "compiler/translator/SearchSymbol.h"
-#include "compiler/InfoSink.h"
-#include "compiler/OutputHLSL.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/OutputHLSL.h"
namespace sh
{
diff --git a/src/compiler/SearchSymbol.h b/src/compiler/translator/SearchSymbol.h
similarity index 87%
rename from src/compiler/SearchSymbol.h
rename to src/compiler/translator/SearchSymbol.h
index 6bc0b90..4047294 100644
--- a/src/compiler/SearchSymbol.h
+++ b/src/compiler/translator/SearchSymbol.h
@@ -9,8 +9,8 @@
#ifndef COMPILER_SEARCHSYMBOL_H_
#define COMPILER_SEARCHSYMBOL_H_
-#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/ParseHelper.h"
namespace sh
{
diff --git a/src/compiler/ShHandle.h b/src/compiler/translator/ShHandle.h
similarity index 95%
rename from src/compiler/ShHandle.h
rename to src/compiler/translator/ShHandle.h
index 3178bee..9f371a6 100644
--- a/src/compiler/ShHandle.h
+++ b/src/compiler/translator/ShHandle.h
@@ -16,12 +16,12 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/BuiltInFunctionEmulator.h"
-#include "compiler/ExtensionBehavior.h"
-#include "compiler/HashNames.h"
-#include "compiler/InfoSink.h"
-#include "compiler/SymbolTable.h"
-#include "compiler/VariableInfo.h"
+#include "compiler/translator/BuiltInFunctionEmulator.h"
+#include "compiler/translator/ExtensionBehavior.h"
+#include "compiler/translator/HashNames.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/SymbolTable.h"
+#include "compiler/translator/VariableInfo.h"
#include "third_party/compiler/ArrayBoundsClamper.h"
class LongNameMap;
diff --git a/src/compiler/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
similarity index 98%
rename from src/compiler/ShaderLang.cpp
rename to src/compiler/translator/ShaderLang.cpp
index acd5b72..907e388 100644
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -11,11 +11,11 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/InitializeDll.h"
+#include "compiler/translator/InitializeDll.h"
#include "compiler/preprocessor/length_limits.h"
-#include "compiler/ShHandle.h"
-#include "compiler/TranslatorHLSL.h"
-#include "compiler/VariablePacker.h"
+#include "compiler/translator/ShHandle.h"
+#include "compiler/translator/TranslatorHLSL.h"
+#include "compiler/translator/VariablePacker.h"
//
// This is the platform independent interface between an OGL driver
diff --git a/src/compiler/ShaderVariable.cpp b/src/compiler/translator/ShaderVariable.cpp
similarity index 97%
rename from src/compiler/ShaderVariable.cpp
rename to src/compiler/translator/ShaderVariable.cpp
index e30f9a3..a8a5e93 100644
--- a/src/compiler/ShaderVariable.cpp
+++ b/src/compiler/translator/ShaderVariable.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/ShaderVariable.h"
namespace sh
{
diff --git a/src/compiler/ShaderVariable.h b/src/compiler/translator/ShaderVariable.h
similarity index 100%
rename from src/compiler/ShaderVariable.h
rename to src/compiler/translator/ShaderVariable.h
diff --git a/src/compiler/SymbolTable.cpp b/src/compiler/translator/SymbolTable.cpp
similarity index 99%
rename from src/compiler/SymbolTable.cpp
rename to src/compiler/translator/SymbolTable.cpp
index 1132386..d8f58c7 100644
--- a/src/compiler/SymbolTable.cpp
+++ b/src/compiler/translator/SymbolTable.cpp
@@ -13,7 +13,7 @@
#pragma warning(disable: 4718)
#endif
-#include "compiler/SymbolTable.h"
+#include "compiler/translator/SymbolTable.h"
#include <stdio.h>
#include <algorithm>
diff --git a/src/compiler/SymbolTable.h b/src/compiler/translator/SymbolTable.h
similarity index 98%
rename from src/compiler/SymbolTable.h
rename to src/compiler/translator/SymbolTable.h
index 1c2f0ef..278171c 100644
--- a/src/compiler/SymbolTable.h
+++ b/src/compiler/translator/SymbolTable.h
@@ -33,8 +33,8 @@
#include <assert.h>
#include "common/angleutils.h"
-#include "compiler/InfoSink.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/intermediate.h"
//
// Symbol base class. (Can build functions or variables out of these...)
diff --git a/src/compiler/TranslatorESSL.cpp b/src/compiler/translator/TranslatorESSL.cpp
similarity index 93%
rename from src/compiler/TranslatorESSL.cpp
rename to src/compiler/translator/TranslatorESSL.cpp
index 709d0bc..fc52463 100644
--- a/src/compiler/TranslatorESSL.cpp
+++ b/src/compiler/translator/TranslatorESSL.cpp
@@ -4,9 +4,9 @@
// found in the LICENSE file.
//
-#include "compiler/TranslatorESSL.h"
+#include "compiler/translator/TranslatorESSL.h"
-#include "compiler/OutputESSL.h"
+#include "compiler/translator/OutputESSL.h"
TranslatorESSL::TranslatorESSL(ShShaderType type, ShShaderSpec spec)
: TCompiler(type, spec) {
diff --git a/src/compiler/TranslatorESSL.h b/src/compiler/translator/TranslatorESSL.h
similarity index 92%
rename from src/compiler/TranslatorESSL.h
rename to src/compiler/translator/TranslatorESSL.h
index a1196bd..e18f3c2 100644
--- a/src/compiler/TranslatorESSL.h
+++ b/src/compiler/translator/TranslatorESSL.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_TRANSLATORESSL_H_
#define COMPILER_TRANSLATORESSL_H_
-#include "compiler/ShHandle.h"
+#include "compiler/translator/ShHandle.h"
class TranslatorESSL : public TCompiler {
public:
diff --git a/src/compiler/TranslatorGLSL.cpp b/src/compiler/translator/TranslatorGLSL.cpp
similarity index 90%
rename from src/compiler/TranslatorGLSL.cpp
rename to src/compiler/translator/TranslatorGLSL.cpp
index 6efd899..315e497 100644
--- a/src/compiler/TranslatorGLSL.cpp
+++ b/src/compiler/translator/TranslatorGLSL.cpp
@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
-#include "compiler/TranslatorGLSL.h"
+#include "compiler/translator/TranslatorGLSL.h"
-#include "compiler/OutputGLSL.h"
-#include "compiler/VersionGLSL.h"
+#include "compiler/translator/OutputGLSL.h"
+#include "compiler/translator/VersionGLSL.h"
static void writeVersion(ShShaderType type, TIntermNode* root,
TInfoSinkBase& sink) {
diff --git a/src/compiler/TranslatorGLSL.h b/src/compiler/translator/TranslatorGLSL.h
similarity index 91%
rename from src/compiler/TranslatorGLSL.h
rename to src/compiler/translator/TranslatorGLSL.h
index c2ce06d..40bb314 100644
--- a/src/compiler/TranslatorGLSL.h
+++ b/src/compiler/translator/TranslatorGLSL.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_TRANSLATORGLSL_H_
#define COMPILER_TRANSLATORGLSL_H_
-#include "compiler/ShHandle.h"
+#include "compiler/translator/ShHandle.h"
class TranslatorGLSL : public TCompiler {
public:
diff --git a/src/compiler/TranslatorHLSL.cpp b/src/compiler/translator/TranslatorHLSL.cpp
similarity index 84%
rename from src/compiler/TranslatorHLSL.cpp
rename to src/compiler/translator/TranslatorHLSL.cpp
index 6eea101..e06d178 100644
--- a/src/compiler/TranslatorHLSL.cpp
+++ b/src/compiler/translator/TranslatorHLSL.cpp
@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
-#include "compiler/TranslatorHLSL.h"
+#include "compiler/translator/TranslatorHLSL.h"
-#include "compiler/InitializeParseContext.h"
-#include "compiler/OutputHLSL.h"
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/OutputHLSL.h"
TranslatorHLSL::TranslatorHLSL(ShShaderType type, ShShaderSpec spec, ShShaderOutput output)
: TCompiler(type, spec), mOutputType(output)
diff --git a/src/compiler/TranslatorHLSL.h b/src/compiler/translator/TranslatorHLSL.h
similarity index 93%
rename from src/compiler/TranslatorHLSL.h
rename to src/compiler/translator/TranslatorHLSL.h
index fa79570..796a16c 100644
--- a/src/compiler/TranslatorHLSL.h
+++ b/src/compiler/translator/TranslatorHLSL.h
@@ -7,8 +7,8 @@
#ifndef COMPILER_TRANSLATORHLSL_H_
#define COMPILER_TRANSLATORHLSL_H_
-#include "compiler/ShHandle.h"
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/ShHandle.h"
+#include "compiler/translator/ShaderVariable.h"
class TranslatorHLSL : public TCompiler {
public:
diff --git a/src/compiler/Types.h b/src/compiler/translator/Types.h
similarity index 98%
rename from src/compiler/Types.h
rename to src/compiler/translator/Types.h
index 4dc916c..f649507 100644
--- a/src/compiler/Types.h
+++ b/src/compiler/translator/Types.h
@@ -9,9 +9,9 @@
#include "common/angleutils.h"
-#include "compiler/BaseTypes.h"
-#include "compiler/Common.h"
-#include "compiler/debug.h"
+#include "compiler/translator/BaseTypes.h"
+#include "compiler/translator/Common.h"
+#include "compiler/translator/compilerdebug.h"
struct TPublicType;
class TType;
diff --git a/src/compiler/UnfoldShortCircuit.cpp b/src/compiler/translator/UnfoldShortCircuit.cpp
similarity index 96%
rename from src/compiler/UnfoldShortCircuit.cpp
rename to src/compiler/translator/UnfoldShortCircuit.cpp
index 47f0afc..303a192 100644
--- a/src/compiler/UnfoldShortCircuit.cpp
+++ b/src/compiler/translator/UnfoldShortCircuit.cpp
@@ -8,10 +8,10 @@
// the original expression.
//
-#include "compiler/UnfoldShortCircuit.h"
+#include "compiler/translator/UnfoldShortCircuit.h"
-#include "compiler/InfoSink.h"
-#include "compiler/OutputHLSL.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/OutputHLSL.h"
namespace sh
{
diff --git a/src/compiler/UnfoldShortCircuit.h b/src/compiler/translator/UnfoldShortCircuit.h
similarity index 90%
rename from src/compiler/UnfoldShortCircuit.h
rename to src/compiler/translator/UnfoldShortCircuit.h
index cb176a5..a6ee23f 100644
--- a/src/compiler/UnfoldShortCircuit.h
+++ b/src/compiler/translator/UnfoldShortCircuit.h
@@ -9,8 +9,8 @@
#ifndef COMPILER_UNFOLDSHORTCIRCUIT_H_
#define COMPILER_UNFOLDSHORTCIRCUIT_H_
-#include "compiler/intermediate.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/ParseHelper.h"
namespace sh
{
diff --git a/src/compiler/ValidateLimitations.cpp b/src/compiler/translator/ValidateLimitations.cpp
similarity index 98%
rename from src/compiler/ValidateLimitations.cpp
rename to src/compiler/translator/ValidateLimitations.cpp
index 8a34f2b..b7157b0 100644
--- a/src/compiler/ValidateLimitations.cpp
+++ b/src/compiler/translator/ValidateLimitations.cpp
@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
-#include "compiler/ValidateLimitations.h"
-#include "compiler/InfoSink.h"
-#include "compiler/InitializeParseContext.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/ValidateLimitations.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/ParseHelper.h"
namespace {
bool IsLoopIndex(const TIntermSymbol* symbol, const TLoopStack& stack) {
diff --git a/src/compiler/ValidateLimitations.h b/src/compiler/translator/ValidateLimitations.h
similarity index 97%
rename from src/compiler/ValidateLimitations.h
rename to src/compiler/translator/ValidateLimitations.h
index a835cb3..8839dd8 100644
--- a/src/compiler/ValidateLimitations.h
+++ b/src/compiler/translator/ValidateLimitations.h
@@ -5,7 +5,7 @@
//
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
class TInfoSinkBase;
diff --git a/src/compiler/ValidateOutputs.cpp b/src/compiler/translator/ValidateOutputs.cpp
similarity index 92%
rename from src/compiler/ValidateOutputs.cpp
rename to src/compiler/translator/ValidateOutputs.cpp
index 9562b78..94b46a1 100644
--- a/src/compiler/ValidateOutputs.cpp
+++ b/src/compiler/translator/ValidateOutputs.cpp
@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
-#include "compiler/ValidateOutputs.h"
-#include "compiler/InfoSink.h"
-#include "compiler/InitializeParseContext.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/ValidateOutputs.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/ParseHelper.h"
ValidateOutputs::ValidateOutputs(TInfoSinkBase& sink, int maxDrawBuffers)
: mSink(sink),
diff --git a/src/compiler/ValidateOutputs.h b/src/compiler/translator/ValidateOutputs.h
similarity index 94%
rename from src/compiler/ValidateOutputs.h
rename to src/compiler/translator/ValidateOutputs.h
index 1f81124..58da54c 100644
--- a/src/compiler/ValidateOutputs.h
+++ b/src/compiler/translator/ValidateOutputs.h
@@ -5,7 +5,7 @@
//
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
#include <set>
diff --git a/src/compiler/VariableInfo.cpp b/src/compiler/translator/VariableInfo.cpp
similarity index 99%
rename from src/compiler/VariableInfo.cpp
rename to src/compiler/translator/VariableInfo.cpp
index a69abcd..2c95533 100644
--- a/src/compiler/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/VariableInfo.h"
+#include "compiler/translator/VariableInfo.h"
namespace {
diff --git a/src/compiler/VariableInfo.h b/src/compiler/translator/VariableInfo.h
similarity index 96%
rename from src/compiler/VariableInfo.h
rename to src/compiler/translator/VariableInfo.h
index 3c7f2a5..4a98013 100644
--- a/src/compiler/VariableInfo.h
+++ b/src/compiler/translator/VariableInfo.h
@@ -8,7 +8,7 @@
#define COMPILER_VARIABLE_INFO_H_
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
// Provides information about a variable.
// It is currently being used to store info about active attribs and uniforms.
diff --git a/src/compiler/VariablePacker.cpp b/src/compiler/translator/VariablePacker.cpp
similarity index 98%
rename from src/compiler/VariablePacker.cpp
rename to src/compiler/translator/VariablePacker.cpp
index ee70b9e..ec57bc4 100644
--- a/src/compiler/VariablePacker.cpp
+++ b/src/compiler/translator/VariablePacker.cpp
@@ -3,10 +3,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
-#include "compiler/VariablePacker.h"
+#include "compiler/translator/VariablePacker.h"
#include <algorithm>
-#include "compiler/ShHandle.h"
+#include "compiler/translator/ShHandle.h"
namespace {
int GetSortOrder(ShDataType type)
diff --git a/src/compiler/VariablePacker.h b/src/compiler/translator/VariablePacker.h
similarity index 96%
rename from src/compiler/VariablePacker.h
rename to src/compiler/translator/VariablePacker.h
index 8987066..fd60908 100644
--- a/src/compiler/VariablePacker.h
+++ b/src/compiler/translator/VariablePacker.h
@@ -8,7 +8,7 @@
#define _VARIABLEPACKER_INCLUDED_
#include <vector>
-#include "compiler/ShHandle.h"
+#include "compiler/translator/ShHandle.h"
class VariablePacker {
public:
diff --git a/src/compiler/VersionGLSL.cpp b/src/compiler/translator/VersionGLSL.cpp
similarity index 98%
rename from src/compiler/VersionGLSL.cpp
rename to src/compiler/translator/VersionGLSL.cpp
index 7a82bb4..dd11f99 100644
--- a/src/compiler/VersionGLSL.cpp
+++ b/src/compiler/translator/VersionGLSL.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/VersionGLSL.h"
+#include "compiler/translator/VersionGLSL.h"
static const int GLSL_VERSION_110 = 110;
static const int GLSL_VERSION_120 = 120;
diff --git a/src/compiler/VersionGLSL.h b/src/compiler/translator/VersionGLSL.h
similarity index 97%
rename from src/compiler/VersionGLSL.h
rename to src/compiler/translator/VersionGLSL.h
index 1c952ca..04581b0 100644
--- a/src/compiler/VersionGLSL.h
+++ b/src/compiler/translator/VersionGLSL.h
@@ -8,7 +8,7 @@
#define COMPILER_VERSIONGLSL_H_
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
// Traverses the intermediate tree to return the minimum GLSL version
// required to legally access all built-in features used in the shader.
diff --git a/src/compiler/debug.cpp b/src/compiler/translator/compilerdebug.cpp
similarity index 82%
rename from src/compiler/debug.cpp
rename to src/compiler/translator/compilerdebug.cpp
index 53778bd..1cee6e7 100644
--- a/src/compiler/debug.cpp
+++ b/src/compiler/translator/compilerdebug.cpp
@@ -6,13 +6,13 @@
// debug.cpp: Debugging utilities.
-#include "compiler/debug.h"
+#include "compiler/translator/compilerdebug.h"
#include <stdarg.h>
#include <stdio.h>
-#include "compiler/InitializeParseContext.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/ParseHelper.h"
static const int kTraceBufferLen = 1024;
diff --git a/src/compiler/debug.h b/src/compiler/translator/compilerdebug.h
similarity index 100%
rename from src/compiler/debug.h
rename to src/compiler/translator/compilerdebug.h
diff --git a/src/compiler/depgraph/DependencyGraph.cpp b/src/compiler/translator/depgraph/DependencyGraph.cpp
similarity index 95%
rename from src/compiler/depgraph/DependencyGraph.cpp
rename to src/compiler/translator/depgraph/DependencyGraph.cpp
index ca661d6..19ddf5c 100644
--- a/src/compiler/depgraph/DependencyGraph.cpp
+++ b/src/compiler/translator/depgraph/DependencyGraph.cpp
@@ -6,8 +6,8 @@
#pragma warning(disable: 4718)
-#include "compiler/depgraph/DependencyGraph.h"
-#include "compiler/depgraph/DependencyGraphBuilder.h"
+#include "compiler/translator/depgraph/DependencyGraph.h"
+#include "compiler/translator/depgraph/DependencyGraphBuilder.h"
TDependencyGraph::TDependencyGraph(TIntermNode* intermNode)
{
diff --git a/src/compiler/depgraph/DependencyGraph.h b/src/compiler/translator/depgraph/DependencyGraph.h
similarity index 99%
rename from src/compiler/depgraph/DependencyGraph.h
rename to src/compiler/translator/depgraph/DependencyGraph.h
index 5a9c35d..5ea1cbb 100644
--- a/src/compiler/depgraph/DependencyGraph.h
+++ b/src/compiler/translator/depgraph/DependencyGraph.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_DEPGRAPH_DEPENDENCY_GRAPH_H
#define COMPILER_DEPGRAPH_DEPENDENCY_GRAPH_H
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
#include <set>
#include <stack>
diff --git a/src/compiler/depgraph/DependencyGraphBuilder.cpp b/src/compiler/translator/depgraph/DependencyGraphBuilder.cpp
similarity index 98%
rename from src/compiler/depgraph/DependencyGraphBuilder.cpp
rename to src/compiler/translator/depgraph/DependencyGraphBuilder.cpp
index d586cfd..79f094c 100644
--- a/src/compiler/depgraph/DependencyGraphBuilder.cpp
+++ b/src/compiler/translator/depgraph/DependencyGraphBuilder.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/depgraph/DependencyGraphBuilder.h"
+#include "compiler/translator/depgraph/DependencyGraphBuilder.h"
void TDependencyGraphBuilder::build(TIntermNode* node, TDependencyGraph* graph)
{
diff --git a/src/compiler/depgraph/DependencyGraphBuilder.h b/src/compiler/translator/depgraph/DependencyGraphBuilder.h
similarity index 98%
rename from src/compiler/depgraph/DependencyGraphBuilder.h
rename to src/compiler/translator/depgraph/DependencyGraphBuilder.h
index c5f232c..3e928fb 100644
--- a/src/compiler/depgraph/DependencyGraphBuilder.h
+++ b/src/compiler/translator/depgraph/DependencyGraphBuilder.h
@@ -7,7 +7,7 @@
#ifndef COMPILER_DEPGRAPH_DEPENDENCY_GRAPH_BUILDER_H
#define COMPILER_DEPGRAPH_DEPENDENCY_GRAPH_BUILDER_H
-#include "compiler/depgraph/DependencyGraph.h"
+#include "compiler/translator/depgraph/DependencyGraph.h"
//
// Creates a dependency graph of symbols, function calls, conditions etc. by traversing a
diff --git a/src/compiler/depgraph/DependencyGraphOutput.cpp b/src/compiler/translator/depgraph/DependencyGraphOutput.cpp
similarity index 96%
rename from src/compiler/depgraph/DependencyGraphOutput.cpp
rename to src/compiler/translator/depgraph/DependencyGraphOutput.cpp
index 6fc489e..e226333 100644
--- a/src/compiler/depgraph/DependencyGraphOutput.cpp
+++ b/src/compiler/translator/depgraph/DependencyGraphOutput.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/depgraph/DependencyGraphOutput.h"
+#include "compiler/translator/depgraph/DependencyGraphOutput.h"
void TDependencyGraphOutput::outputIndentation()
{
diff --git a/src/compiler/depgraph/DependencyGraphOutput.h b/src/compiler/translator/depgraph/DependencyGraphOutput.h
similarity index 90%
rename from src/compiler/depgraph/DependencyGraphOutput.h
rename to src/compiler/translator/depgraph/DependencyGraphOutput.h
index 01447da..c3a4112 100644
--- a/src/compiler/depgraph/DependencyGraphOutput.h
+++ b/src/compiler/translator/depgraph/DependencyGraphOutput.h
@@ -7,8 +7,8 @@
#ifndef COMPILER_DEPGRAPH_DEPENDENCY_GRAPH_OUTPUT_H
#define COMPILER_DEPGRAPH_DEPENDENCY_GRAPH_OUTPUT_H
-#include "compiler/depgraph/DependencyGraph.h"
-#include "compiler/InfoSink.h"
+#include "compiler/translator/depgraph/DependencyGraph.h"
+#include "compiler/translator/InfoSink.h"
class TDependencyGraphOutput : public TDependencyGraphTraverser {
public:
diff --git a/src/compiler/depgraph/DependencyGraphTraverse.cpp b/src/compiler/translator/depgraph/DependencyGraphTraverse.cpp
similarity index 96%
rename from src/compiler/depgraph/DependencyGraphTraverse.cpp
rename to src/compiler/translator/depgraph/DependencyGraphTraverse.cpp
index b158575..197fde9 100644
--- a/src/compiler/depgraph/DependencyGraphTraverse.cpp
+++ b/src/compiler/translator/depgraph/DependencyGraphTraverse.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/depgraph/DependencyGraph.h"
+#include "compiler/translator/depgraph/DependencyGraph.h"
// These methods do a breadth-first traversal through the graph and mark visited nodes.
diff --git a/src/compiler/generate_parser.sh b/src/compiler/translator/generate_parser.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/compiler/generate_parser.sh
rename to src/compiler/translator/generate_parser.sh
diff --git a/src/compiler/glslang.h b/src/compiler/translator/glslang.h
similarity index 100%
rename from src/compiler/glslang.h
rename to src/compiler/translator/glslang.h
diff --git a/src/compiler/glslang.l b/src/compiler/translator/glslang.l
similarity index 98%
rename from src/compiler/glslang.l
rename to src/compiler/translator/glslang.l
index 05cb0d6..4b87836 100644
--- a/src/compiler/glslang.l
+++ b/src/compiler/translator/glslang.l
@@ -36,10 +36,10 @@
}
%{
-#include "compiler/glslang.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/glslang.h"
+#include "compiler/translator/ParseHelper.h"
#include "compiler/preprocessor/Token.h"
-#include "compiler/util.h"
+#include "compiler/translator/util.h"
#include "glslang_tab.h"
/* windows only pragma */
diff --git a/src/compiler/glslang.y b/src/compiler/translator/glslang.y
similarity index 99%
rename from src/compiler/glslang.y
rename to src/compiler/translator/glslang.y
index 1183054..1bc6ad2 100644
--- a/src/compiler/glslang.y
+++ b/src/compiler/translator/glslang.y
@@ -34,8 +34,8 @@
#pragma warning(disable: 4701)
#endif
-#include "compiler/SymbolTable.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/SymbolTable.h"
+#include "compiler/translator/ParseHelper.h"
#include "GLSLANG/ShaderLang.h"
#define YYENABLE_NLS 0
diff --git a/src/compiler/glslang_lex.cpp b/src/compiler/translator/glslang_lex.cpp
similarity index 99%
rename from src/compiler/glslang_lex.cpp
rename to src/compiler/translator/glslang_lex.cpp
index 4578a1c..fc1d93f 100644
--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/translator/glslang_lex.cpp
@@ -995,10 +995,10 @@
WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
*/
-#include "compiler/glslang.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/glslang.h"
+#include "compiler/translator/ParseHelper.h"
#include "compiler/preprocessor/Token.h"
-#include "compiler/util.h"
+#include "compiler/translator/util.h"
#include "glslang_tab.h"
/* windows only pragma */
diff --git a/src/compiler/glslang_tab.cpp b/src/compiler/translator/glslang_tab.cpp
similarity index 99%
rename from src/compiler/glslang_tab.cpp
rename to src/compiler/translator/glslang_tab.cpp
index a21ae93..44f9cd2 100644
--- a/src/compiler/glslang_tab.cpp
+++ b/src/compiler/translator/glslang_tab.cpp
@@ -84,8 +84,8 @@
#pragma warning(disable: 4701)
#endif
-#include "compiler/SymbolTable.h"
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/SymbolTable.h"
+#include "compiler/translator/ParseHelper.h"
#include "GLSLANG/ShaderLang.h"
#define YYENABLE_NLS 0
diff --git a/src/compiler/glslang_tab.h b/src/compiler/translator/glslang_tab.h
similarity index 100%
rename from src/compiler/glslang_tab.h
rename to src/compiler/translator/glslang_tab.h
diff --git a/src/compiler/intermOut.cpp b/src/compiler/translator/intermOut.cpp
similarity index 99%
rename from src/compiler/intermOut.cpp
rename to src/compiler/translator/intermOut.cpp
index 3266fc7..7f94ac3 100644
--- a/src/compiler/intermOut.cpp
+++ b/src/compiler/translator/intermOut.cpp
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#include "compiler/localintermediate.h"
-#include "compiler/SymbolTable.h"
+#include "compiler/translator/localintermediate.h"
+#include "compiler/translator/SymbolTable.h"
//
// Two purposes:
diff --git a/src/compiler/intermediate.h b/src/compiler/translator/intermediate.h
similarity index 98%
rename from src/compiler/intermediate.h
rename to src/compiler/translator/intermediate.h
index efc3a6e..bc62a7d 100644
--- a/src/compiler/intermediate.h
+++ b/src/compiler/translator/intermediate.h
@@ -19,9 +19,9 @@
#include "GLSLANG/ShaderLang.h"
#include <algorithm>
-#include "compiler/Common.h"
-#include "compiler/Types.h"
-#include "compiler/ConstantUnion.h"
+#include "compiler/translator/Common.h"
+#include "compiler/translator/Types.h"
+#include "compiler/translator/ConstantUnion.h"
//
// Operators used by the high-level (parse tree) representation.
diff --git a/src/compiler/localintermediate.h b/src/compiler/translator/localintermediate.h
similarity index 97%
rename from src/compiler/localintermediate.h
rename to src/compiler/translator/localintermediate.h
index 74020cb..2212e63 100644
--- a/src/compiler/localintermediate.h
+++ b/src/compiler/translator/localintermediate.h
@@ -8,7 +8,7 @@
#define _LOCAL_INTERMEDIATE_INCLUDED_
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/intermediate.h"
struct TVectorFields {
int offsets[4];
diff --git a/src/compiler/osinclude.h b/src/compiler/translator/osinclude.h
similarity index 96%
rename from src/compiler/osinclude.h
rename to src/compiler/translator/osinclude.h
index d8bb1a7..dceeb88 100644
--- a/src/compiler/osinclude.h
+++ b/src/compiler/translator/osinclude.h
@@ -35,7 +35,7 @@
#endif // ANGLE_OS_WIN
-#include "compiler/debug.h"
+#include "compiler/translator/compilerdebug.h"
//
// Thread Local Storage Operations
diff --git a/src/compiler/ossource_posix.cpp b/src/compiler/translator/ossource_posix.cpp
similarity index 96%
rename from src/compiler/ossource_posix.cpp
rename to src/compiler/translator/ossource_posix.cpp
index 1e1e699..90a3757 100644
--- a/src/compiler/ossource_posix.cpp
+++ b/src/compiler/translator/ossource_posix.cpp
@@ -7,7 +7,7 @@
//
// This file contains the posix specific functions
//
-#include "compiler/osinclude.h"
+#include "compiler/translator/osinclude.h"
#if !defined(ANGLE_OS_POSIX)
#error Trying to build a posix specific file in a non-posix build.
diff --git a/src/compiler/ossource_win.cpp b/src/compiler/translator/ossource_win.cpp
similarity index 95%
rename from src/compiler/ossource_win.cpp
rename to src/compiler/translator/ossource_win.cpp
index 89922fe..2cc5871 100644
--- a/src/compiler/ossource_win.cpp
+++ b/src/compiler/translator/ossource_win.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/osinclude.h"
+#include "compiler/translator/osinclude.h"
//
// This file contains contains the window's specific functions
//
diff --git a/src/compiler/parseConst.cpp b/src/compiler/translator/parseConst.cpp
similarity index 99%
rename from src/compiler/parseConst.cpp
rename to src/compiler/translator/parseConst.cpp
index 769a7b3..87000c6 100644
--- a/src/compiler/parseConst.cpp
+++ b/src/compiler/translator/parseConst.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/ParseHelper.h"
+#include "compiler/translator/ParseHelper.h"
//
// Use this class to carry along data from node to node in
diff --git a/src/compiler/timing/RestrictFragmentShaderTiming.cpp b/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
similarity index 95%
rename from src/compiler/timing/RestrictFragmentShaderTiming.cpp
rename to src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
index 538b731..0c86d1a 100644
--- a/src/compiler/timing/RestrictFragmentShaderTiming.cpp
+++ b/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
-#include "compiler/InfoSink.h"
-#include "compiler/ParseHelper.h"
-#include "compiler/depgraph/DependencyGraphOutput.h"
-#include "compiler/timing/RestrictFragmentShaderTiming.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/ParseHelper.h"
+#include "compiler/translator/depgraph/DependencyGraphOutput.h"
+#include "compiler/translator/timing/RestrictFragmentShaderTiming.h"
RestrictFragmentShaderTiming::RestrictFragmentShaderTiming(TInfoSinkBase& sink)
: mSink(sink)
diff --git a/src/compiler/timing/RestrictFragmentShaderTiming.h b/src/compiler/translator/timing/RestrictFragmentShaderTiming.h
similarity index 91%
rename from src/compiler/timing/RestrictFragmentShaderTiming.h
rename to src/compiler/translator/timing/RestrictFragmentShaderTiming.h
index 899165c..323cb62 100644
--- a/src/compiler/timing/RestrictFragmentShaderTiming.h
+++ b/src/compiler/translator/timing/RestrictFragmentShaderTiming.h
@@ -9,8 +9,8 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
-#include "compiler/depgraph/DependencyGraph.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/depgraph/DependencyGraph.h"
class TInfoSinkBase;
diff --git a/src/compiler/timing/RestrictVertexShaderTiming.cpp b/src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
similarity index 87%
rename from src/compiler/timing/RestrictVertexShaderTiming.cpp
rename to src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
index 57c01eb..7c1208a 100644
--- a/src/compiler/timing/RestrictVertexShaderTiming.cpp
+++ b/src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/timing/RestrictVertexShaderTiming.h"
+#include "compiler/translator/timing/RestrictVertexShaderTiming.h"
void RestrictVertexShaderTiming::visitSymbol(TIntermSymbol* node)
{
diff --git a/src/compiler/timing/RestrictVertexShaderTiming.h b/src/compiler/translator/timing/RestrictVertexShaderTiming.h
similarity index 90%
rename from src/compiler/timing/RestrictVertexShaderTiming.h
rename to src/compiler/translator/timing/RestrictVertexShaderTiming.h
index 19a05fa..5f0dd31 100644
--- a/src/compiler/timing/RestrictVertexShaderTiming.h
+++ b/src/compiler/translator/timing/RestrictVertexShaderTiming.h
@@ -9,8 +9,8 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/intermediate.h"
-#include "compiler/InfoSink.h"
+#include "compiler/translator/intermediate.h"
+#include "compiler/translator/InfoSink.h"
class TInfoSinkBase;
diff --git a/src/compiler/util.cpp b/src/compiler/translator/util.cpp
similarity index 94%
rename from src/compiler/util.cpp
rename to src/compiler/translator/util.cpp
index d6e5eee..077bdcc 100644
--- a/src/compiler/util.cpp
+++ b/src/compiler/translator/util.cpp
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-#include "compiler/util.h"
+#include "compiler/translator/util.h"
#include <limits>
diff --git a/src/compiler/util.h b/src/compiler/translator/util.h
similarity index 100%
rename from src/compiler/util.h
rename to src/compiler/translator/util.h
diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index 01d61f7..4ee1269 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -24,7 +24,7 @@
#include "libGLESv2/Context.h"
#include "libGLESv2/Buffer.h"
-#include "compiler/HLSLLayoutEncoder.h"
+#include "compiler/translator/HLSLLayoutEncoder.h"
#undef near
#undef far
diff --git a/src/libGLESv2/Shader.h b/src/libGLESv2/Shader.h
index b3096b3..54dcccb 100644
--- a/src/libGLESv2/Shader.h
+++ b/src/libGLESv2/Shader.h
@@ -19,7 +19,7 @@
#include <list>
#include <vector>
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/ShaderVariable.h"
#include "common/angleutils.h"
namespace rx
diff --git a/src/libGLESv2/Uniform.h b/src/libGLESv2/Uniform.h
index c90647b..fa8ba3a 100644
--- a/src/libGLESv2/Uniform.h
+++ b/src/libGLESv2/Uniform.h
@@ -16,7 +16,7 @@
#include "common/debug.h"
#include "angletypes.h"
-#include "compiler/ShaderVariable.h"
+#include "compiler/translator/ShaderVariable.h"
namespace gl
{
diff --git a/src/third_party/compiler/ArrayBoundsClamper.h b/src/third_party/compiler/ArrayBoundsClamper.h
index 0d4e1a3..f725f55 100644
--- a/src/third_party/compiler/ArrayBoundsClamper.h
+++ b/src/third_party/compiler/ArrayBoundsClamper.h
@@ -28,8 +28,8 @@
#include "GLSLANG/ShaderLang.h"
-#include "compiler/InfoSink.h"
-#include "compiler/intermediate.h"
+#include "compiler/translator/InfoSink.h"
+#include "compiler/translator/intermediate.h"
class ArrayBoundsClamper {
public: