Rename compiler/Uniform.cpp+h to ShaderVariable.cpp+h.

src/build_angle.gypi

@@ -116,12 +116,12 @@
         '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/Uniform.cpp',
-        'compiler/Uniform.h',
         'compiler/util.cpp',
         'compiler/util.h',
         'compiler/ValidateLimitations.cpp',

src/compiler/BlockLayoutEncoder.cpp

@@ -5,7 +5,7 @@
 //
 
 #include "compiler/BlockLayoutEncoder.h"
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 #include "common/mathutil.h"
 #include "common/utilities.h"
 

src/compiler/HLSLLayoutEncoder.cpp

@@ -5,7 +5,7 @@
 //
 
 #include "compiler/HLSLLayoutEncoder.h"
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 #include "common/mathutil.h"
 #include "common/utilities.h"
 

src/compiler/OutputHLSL.h

@@ -17,7 +17,7 @@
 
 #include "compiler/intermediate.h"
 #include "compiler/ParseHelper.h"
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 
 namespace sh
 {

src/compiler/Uniform.cpp → src/compiler/ShaderVariable.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 
 namespace sh
 {

src/compiler/TranslatorHLSL.h

@@ -8,7 +8,7 @@
 #define COMPILER_TRANSLATORHLSL_H_
 
 #include "compiler/ShHandle.h"
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 
 class TranslatorHLSL : public TCompiler {
 public:

src/compiler/translator_hlsl.vcxproj

@@ -150,7 +150,7 @@
     <ClCompile Include="SearchSymbol.cpp" />
     <ClCompile Include="TranslatorHLSL.cpp" />
     <ClCompile Include="UnfoldShortCircuit.cpp" />
-    <ClCompile Include="Uniform.cpp" />
+    <ClCompile Include="ShaderVariable.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FlagStd140Structs.h" />
@@ -160,7 +160,7 @@
     <ClInclude Include="SearchSymbol.h" />
     <ClInclude Include="TranslatorHLSL.h" />
     <ClInclude Include="UnfoldShortCircuit.h" />
-    <ClInclude Include="Uniform.h" />
+    <ClInclude Include="ShaderVariable.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/compiler/translator_hlsl.vcxproj.filters

@@ -29,15 +29,15 @@
     <ClCompile Include="UnfoldShortCircuit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Uniform.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="HLSLLayoutEncoder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="FlagStd140Structs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ShaderVariable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="DetectDiscontinuity.h">
@@ -55,14 +55,14 @@
     <ClInclude Include="UnfoldShortCircuit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Uniform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="HLSLLayoutEncoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="FlagStd140Structs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ShaderVariable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

src/libGLESv2/Shader.h

@@ -19,7 +19,7 @@
 #include <list>
 #include <vector>
 
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 #include "common/angleutils.h"
 
 namespace rx

src/libGLESv2/Uniform.h

@@ -16,7 +16,7 @@
 
 #include "common/debug.h"
 #include "angletypes.h"
-#include "compiler/Uniform.h"
+#include "compiler/ShaderVariable.h"
 
 namespace gl
 {