Rename UniformLinker.cpp/h to ProgramLinkedResources.

src/libANGLE/Program.cpp

@@ -19,9 +19,9 @@
 #include "compiler/translator/blocklayout.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/MemoryProgramCache.h"
+#include "libANGLE/ProgramLinkedResources.h"
 #include "libANGLE/ResourceManager.h"
 #include "libANGLE/Uniform.h"
-#include "libANGLE/UniformLinker.h"
 #include "libANGLE/VaryingPacking.h"
 #include "libANGLE/features.h"
 #include "libANGLE/histogram_macros.h"

src/libANGLE/UniformLinker.cpp → src/libANGLE/ProgramLinkedResources.cpp

@@ -8,7 +8,7 @@
 // locations. Populates data structures related to uniforms so that they can be stored in program
 // state.
 
-#include "libANGLE/UniformLinker.h"
+#include "libANGLE/ProgramLinkedResources.h"
 
 #include "common/string_utils.h"
 #include "common/utilities.h"
@@ -572,7 +572,7 @@ UniformLinker::ShaderUniformCount UniformLinker::flattenUniformImpl(
                                     uniform.arraySize, binding, offset, *location, -1,
                                     sh::BlockMemberInfo::getDefaultBlockInfo());
         linkedUniform.mappedName = fullMappedNameWithArrayIndex;
-        linkedUniform.staticUse = markStaticUse;
+        linkedUniform.staticUse  = markStaticUse;
         if (markStaticUse)
         {
             linkedUniform.setStaticUse(shaderType, true);
@@ -587,7 +587,7 @@ UniformLinker::ShaderUniformCount UniformLinker::flattenUniformImpl(
     // Likewise, don't count "real" uniforms towards opaque count.
     shaderUniformCount.vectorCount =
         (IsOpaqueType(uniform.type) ? 0 : (VariableRegisterCount(uniform.type) * elementCount));
-    shaderUniformCount.samplerCount = (isSampler ? elementCount : 0);
+    shaderUniformCount.samplerCount       = (isSampler ? elementCount : 0);
     shaderUniformCount.imageCount         = (isImage ? elementCount : 0);
     shaderUniformCount.atomicCounterCount = (isAtomicCounter ? elementCount : 0);
 

src/libANGLE/renderer/ProgramImpl_mock.h

@@ -12,7 +12,7 @@
 
 #include "gmock/gmock.h"
 
-#include "libANGLE/UniformLinker.h"
+#include "libANGLE/ProgramLinkedResources.h"
 #include "libANGLE/renderer/ProgramImpl.h"
 
 namespace rx

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -15,8 +15,8 @@
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/FramebufferAttachment.h"
 #include "libANGLE/Program.h"
+#include "libANGLE/ProgramLinkedResources.h"
 #include "libANGLE/Uniform.h"
-#include "libANGLE/UniformLinker.h"
 #include "libANGLE/VertexArray.h"
 #include "libANGLE/features.h"
 #include "libANGLE/queryconversions.h"

src/libGLESv2.gypi

@@ -177,6 +177,8 @@
             'libANGLE/Platform.cpp',
             'libANGLE/Program.cpp',
             'libANGLE/Program.h',
+            'libANGLE/ProgramLinkedResources.cpp',
+            'libANGLE/ProgramLinkedResources.h',
             'libANGLE/ProgramPipeline.cpp',
             'libANGLE/ProgramPipeline.h',
             'libANGLE/Query.cpp',
@@ -206,8 +208,6 @@
             'libANGLE/TransformFeedback.h',
             'libANGLE/Uniform.cpp',
             'libANGLE/Uniform.h',
-            'libANGLE/UniformLinker.cpp',
-            'libANGLE/UniformLinker.h',
             'libANGLE/VaryingPacking.cpp',
             'libANGLE/VaryingPacking.h',
             'libANGLE/Version.h',