Skip to content

A
angle
Commit d4a3a317 by Jamie Madill
Options

Rename ShHandle.h to Compiler.h.

Since the above source file matches Compiler.cpp, more closely follow our standard naming convention. BUG=angle:466 Change-Id: Ib1422f87f16097f91f2bcdad550ec5bd940ce711 Reviewed-on: https://chromium-review.googlesource.com/204681Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org>
parent f2575989
Showing with 16 additions and 17 deletions
projects/src/translator_lib.vcxproj
...@@ -158,12 +158,11 @@ ...@@ -158,12 +158,11 @@
<ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/> <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeVariables.h"/> <ClInclude Include="..\..\src\compiler\translator\InitializeVariables.h"/>
<ClInclude Include="..\..\src\compiler\translator\localintermediate.h"/> <ClInclude Include="..\..\src\compiler\translator\localintermediate.h"/>
<ClInclude Include="..\..\src\compiler\translator\ShHandle.h"/>
<ClInclude Include="..\..\src\compiler\translator\StructureHLSL.h"/> <ClInclude Include="..\..\src\compiler\translator\StructureHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h"/>
<ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"/> <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"/>
<ClInclude Include="..\..\src\compiler\translator\Pragma.h"/> <ClInclude Include="..\..\src\compiler\translator\Pragma.h"/>
<ClInclude Include="..\..\src\compiler\translator\intermediate.h"/> <ClInclude Include="..\..\src\compiler\translator\Compiler.h"/>
<ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h"/> <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/> <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/>
...@@ -177,6 +176,7 @@ ...@@ -177,6 +176,7 @@
<ClInclude Include="..\..\src\compiler\translator\glslang.h"/> <ClInclude Include="..\..\src\compiler\translator\glslang.h"/>
<ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h"/> <ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h"/>
<ClInclude Include="..\..\src\compiler\translator\UtilsHLSL.h"/> <ClInclude Include="..\..\src\compiler\translator\UtilsHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\intermediate.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/> <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
<ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/> <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/>
<ClInclude Include="..\..\src\compiler\translator\LoopInfo.h"/> <ClInclude Include="..\..\src\compiler\translator\LoopInfo.h"/>
......
projects/src/translator_lib.vcxproj.filters
...@@ -258,9 +258,6 @@ ...@@ -258,9 +258,6 @@
<ClInclude Include="..\..\src\compiler\translator\localintermediate.h"> <ClInclude Include="..\..\src\compiler\translator\localintermediate.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\ShHandle.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\StructureHLSL.h"> <ClInclude Include="..\..\src\compiler\translator\StructureHLSL.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -273,7 +270,7 @@ ...@@ -273,7 +270,7 @@
<ClInclude Include="..\..\src\compiler\translator\Pragma.h"> <ClInclude Include="..\..\src\compiler\translator\Pragma.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\intermediate.h"> <ClInclude Include="..\..\src\compiler\translator\Compiler.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"> <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
...@@ -372,6 +369,9 @@ ...@@ -372,6 +369,9 @@
<ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp"> <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\intermediate.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"> <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
......
src/compiler/translator/Compiler.cpp
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
// //
#include "compiler/translator/BuiltInFunctionEmulator.h" #include "compiler/translator/BuiltInFunctionEmulator.h"
#include "compiler/translator/Compiler.h"
#include "compiler/translator/DetectCallDepth.h" #include "compiler/translator/DetectCallDepth.h"
#include "compiler/translator/ForLoopUnroll.h" #include "compiler/translator/ForLoopUnroll.h"
#include "compiler/translator/Initialize.h" #include "compiler/translator/Initialize.h"
...@@ -12,7 +13,6 @@ ...@@ -12,7 +13,6 @@
#include "compiler/translator/InitializeVariables.h" #include "compiler/translator/InitializeVariables.h"
#include "compiler/translator/ParseContext.h" #include "compiler/translator/ParseContext.h"
#include "compiler/translator/RenameFunction.h" #include "compiler/translator/RenameFunction.h"
#include "compiler/translator/ShHandle.h"
#include "compiler/translator/UnfoldShortCircuitAST.h" #include "compiler/translator/UnfoldShortCircuitAST.h"
#include "compiler/translator/ValidateLimitations.h" #include "compiler/translator/ValidateLimitations.h"
#include "compiler/translator/ValidateOutputs.h" #include "compiler/translator/ValidateOutputs.h"
......
src/compiler/translator/ShHandle.h → src/compiler/translator/Compiler.h
...@@ -115,7 +115,7 @@ protected: ...@@ -115,7 +115,7 @@ protected:
bool enforceTimingRestrictions(TIntermNode* root, bool outputGraph); bool enforceTimingRestrictions(TIntermNode* root, bool outputGraph);
// Returns true if the shader does not use samplers. // Returns true if the shader does not use samplers.
bool enforceVertexShaderTimingRestrictions(TIntermNode* root); bool enforceVertexShaderTimingRestrictions(TIntermNode* root);
// Returns true if the shader does not use sampler dependent values to affect control // Returns true if the shader does not use sampler dependent values to affect control
// flow or in operations whose time can depend on the input values. // flow or in operations whose time can depend on the input values.
bool enforceFragmentShaderTimingRestrictions(const TDependencyGraph& graph); bool enforceFragmentShaderTimingRestrictions(const TDependencyGraph& graph);
// Return true if the maximum expression complexity is below the limit. // Return true if the maximum expression complexity is below the limit.
...@@ -169,7 +169,7 @@ private: ...@@ -169,7 +169,7 @@ private:
// and the machine dependent code. // and the machine dependent code.
// //
// The machine dependent code should derive from the classes // The machine dependent code should derive from the classes
// above. Then Construct*() and Delete*() will create and // above. Then Construct*() and Delete*() will create and
// destroy the machine dependent objects, which contain the // destroy the machine dependent objects, which contain the
// above machine independent information. // above machine independent information.
// //
......
src/compiler/translator/Initialize.h
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define _INITIALIZE_INCLUDED_ #define _INITIALIZE_INCLUDED_
#include "compiler/translator/Common.h" #include "compiler/translator/Common.h"
#include "compiler/translator/ShHandle.h" #include "compiler/translator/Compiler.h"
#include "compiler/translator/SymbolTable.h" #include "compiler/translator/SymbolTable.h"
void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources, TSymbolTable &table); void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources, TSymbolTable &table);
......
src/compiler/translator/ParseContext.h
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
#ifndef _PARSER_HELPER_INCLUDED_ #ifndef _PARSER_HELPER_INCLUDED_
#define _PARSER_HELPER_INCLUDED_ #define _PARSER_HELPER_INCLUDED_
#include "compiler/translator/Compiler.h"
#include "compiler/translator/Diagnostics.h" #include "compiler/translator/Diagnostics.h"
#include "compiler/translator/DirectiveHandler.h" #include "compiler/translator/DirectiveHandler.h"
#include "compiler/translator/localintermediate.h" #include "compiler/translator/localintermediate.h"
#include "compiler/translator/ShHandle.h"
#include "compiler/translator/SymbolTable.h" #include "compiler/translator/SymbolTable.h"
#include "compiler/preprocessor/Preprocessor.h" #include "compiler/preprocessor/Preprocessor.h"
......
src/compiler/translator/ShaderLang.cpp
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#include "compiler/translator/Compiler.h"
#include "compiler/translator/InitializeDll.h" #include "compiler/translator/InitializeDll.h"
#include "compiler/translator/length_limits.h" #include "compiler/translator/length_limits.h"
#include "compiler/translator/ShHandle.h"
#include "compiler/translator/TranslatorHLSL.h" #include "compiler/translator/TranslatorHLSL.h"
#include "compiler/translator/VariablePacker.h" #include "compiler/translator/VariablePacker.h"
......
src/compiler/translator/TranslatorESSL.h
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef COMPILER_TRANSLATORESSL_H_ #ifndef COMPILER_TRANSLATORESSL_H_
#define COMPILER_TRANSLATORESSL_H_ #define COMPILER_TRANSLATORESSL_H_
#include "compiler/translator/ShHandle.h" #include "compiler/translator/Compiler.h"
class TranslatorESSL : public TCompiler { class TranslatorESSL : public TCompiler {
public: public:
......
src/compiler/translator/TranslatorGLSL.h
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef COMPILER_TRANSLATORGLSL_H_ #ifndef COMPILER_TRANSLATORGLSL_H_
#define COMPILER_TRANSLATORGLSL_H_ #define COMPILER_TRANSLATORGLSL_H_
#include "compiler/translator/ShHandle.h" #include "compiler/translator/Compiler.h"
class TranslatorGLSL : public TCompiler { class TranslatorGLSL : public TCompiler {
public: public:
......
src/compiler/translator/TranslatorHLSL.h
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef COMPILER_TRANSLATORHLSL_H_ #ifndef COMPILER_TRANSLATORHLSL_H_
#define COMPILER_TRANSLATORHLSL_H_ #define COMPILER_TRANSLATORHLSL_H_
#include "compiler/translator/ShHandle.h" #include "compiler/translator/Compiler.h"
#include "common/shadervars.h" #include "common/shadervars.h"
class TranslatorHLSL : public TCompiler { class TranslatorHLSL : public TCompiler {
......
src/compiler/translator/VariablePacker.cpp
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "compiler/translator/VariablePacker.h" #include "compiler/translator/VariablePacker.h"
#include <algorithm> #include <algorithm>
#include "compiler/translator/ShHandle.h"
namespace { namespace {
int GetSortOrder(ShDataType type) int GetSortOrder(ShDataType type)
......
src/compiler/translator/VariablePacker.h
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define _VARIABLEPACKER_INCLUDED_ #define _VARIABLEPACKER_INCLUDED_
#include <vector> #include <vector>
#include "compiler/translator/ShHandle.h" #include "compiler/translator/VariableInfo.h"
class VariablePacker { class VariablePacker {
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment