michael@0: From: Jeff Gilbert <jgilbert@mozilla.com>
michael@0: 
michael@0: diff --git a/gfx/angle/src/compiler/Uniform.cpp b/gfx/angle/src/compiler/CompilerUniform.cpp
michael@0: rename from gfx/angle/src/compiler/Uniform.cpp
michael@0: rename to gfx/angle/src/compiler/CompilerUniform.cpp
michael@0: --- a/gfx/angle/src/compiler/Uniform.cpp
michael@0: +++ b/gfx/angle/src/compiler/CompilerUniform.cpp
michael@0: @@ -1,15 +1,15 @@
michael@0:  //
michael@0:  // Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0: -#include "compiler/Uniform.h"
michael@0: +#include "CompilerUniform.h"
michael@0:  
michael@0:  namespace sh
michael@0:  {
michael@0:  
michael@0:  Uniform::Uniform(GLenum type, GLenum precision, const char *name, int arraySize, int registerIndex)
michael@0:  {
michael@0:      this->type = type;
michael@0:      this->precision = precision;
michael@0: diff --git a/gfx/angle/src/compiler/Uniform.h b/gfx/angle/src/compiler/CompilerUniform.h
michael@0: rename from gfx/angle/src/compiler/Uniform.h
michael@0: rename to gfx/angle/src/compiler/CompilerUniform.h
michael@0: diff --git a/gfx/angle/src/compiler/OutputHLSL.h b/gfx/angle/src/compiler/OutputHLSL.h
michael@0: --- a/gfx/angle/src/compiler/OutputHLSL.h
michael@0: +++ b/gfx/angle/src/compiler/OutputHLSL.h
michael@0: @@ -11,17 +11,17 @@
michael@0:  #include <set>
michael@0:  #include <map>
michael@0:  
michael@0:  #define GL_APICALL
michael@0:  #include <GLES2/gl2.h>
michael@0:  
michael@0:  #include "compiler/intermediate.h"
michael@0:  #include "compiler/ParseHelper.h"
michael@0: -#include "compiler/Uniform.h"
michael@0: +#include "compiler/CompilerUniform.h"
michael@0:  
michael@0:  namespace sh
michael@0:  {
michael@0:  class UnfoldShortCircuit;
michael@0:  
michael@0:  class OutputHLSL : public TIntermTraverser
michael@0:  {
michael@0:    public:
michael@0: diff --git a/gfx/angle/src/compiler/TranslatorHLSL.h b/gfx/angle/src/compiler/TranslatorHLSL.h
michael@0: --- a/gfx/angle/src/compiler/TranslatorHLSL.h
michael@0: +++ b/gfx/angle/src/compiler/TranslatorHLSL.h
michael@0: @@ -3,17 +3,17 @@
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  #ifndef COMPILER_TRANSLATORHLSL_H_
michael@0:  #define COMPILER_TRANSLATORHLSL_H_
michael@0:  
michael@0:  #include "compiler/ShHandle.h"
michael@0: -#include "compiler/Uniform.h"
michael@0: +#include "compiler/CompilerUniform.h"
michael@0:  
michael@0:  class TranslatorHLSL : public TCompiler {
michael@0:  public:
michael@0:      TranslatorHLSL(ShShaderType type, ShShaderSpec spec, ShShaderOutput output);
michael@0:  
michael@0:      virtual TranslatorHLSL *getAsTranslatorHLSL() { return this; }
michael@0:      const sh::ActiveUniforms &getUniforms() { return mActiveUniforms; }
michael@0:  
michael@0: diff --git a/gfx/angle/src/libGLESv2/Shader.h b/gfx/angle/src/libGLESv2/Shader.h
michael@0: --- a/gfx/angle/src/libGLESv2/Shader.h
michael@0: +++ b/gfx/angle/src/libGLESv2/Shader.h
michael@0: @@ -13,17 +13,17 @@
michael@0:  #define LIBGLESV2_SHADER_H_
michael@0:  
michael@0:  #define GL_APICALL
michael@0:  #include <GLES2/gl2.h>
michael@0:  #include <string>
michael@0:  #include <list>
michael@0:  #include <vector>
michael@0:  
michael@0: -#include "compiler/Uniform.h"
michael@0: +#include "compiler/CompilerUniform.h"
michael@0:  #include "common/angleutils.h"
michael@0:  
michael@0:  namespace rx
michael@0:  {
michael@0:  class Renderer;
michael@0:  }
michael@0:  
michael@0:  namespace gl