1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/angle/angle-build-dedupe-uniform-cpp-h.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,93 @@
1.4 +From: Jeff Gilbert <jgilbert@mozilla.com>
1.5 +
1.6 +diff --git a/gfx/angle/src/compiler/Uniform.cpp b/gfx/angle/src/compiler/CompilerUniform.cpp
1.7 +rename from gfx/angle/src/compiler/Uniform.cpp
1.8 +rename to gfx/angle/src/compiler/CompilerUniform.cpp
1.9 +--- a/gfx/angle/src/compiler/Uniform.cpp
1.10 ++++ b/gfx/angle/src/compiler/CompilerUniform.cpp
1.11 +@@ -1,15 +1,15 @@
1.12 + //
1.13 + // Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
1.14 + // Use of this source code is governed by a BSD-style license that can be
1.15 + // found in the LICENSE file.
1.16 + //
1.17 +
1.18 +-#include "compiler/Uniform.h"
1.19 ++#include "CompilerUniform.h"
1.20 +
1.21 + namespace sh
1.22 + {
1.23 +
1.24 + Uniform::Uniform(GLenum type, GLenum precision, const char *name, int arraySize, int registerIndex)
1.25 + {
1.26 + this->type = type;
1.27 + this->precision = precision;
1.28 +diff --git a/gfx/angle/src/compiler/Uniform.h b/gfx/angle/src/compiler/CompilerUniform.h
1.29 +rename from gfx/angle/src/compiler/Uniform.h
1.30 +rename to gfx/angle/src/compiler/CompilerUniform.h
1.31 +diff --git a/gfx/angle/src/compiler/OutputHLSL.h b/gfx/angle/src/compiler/OutputHLSL.h
1.32 +--- a/gfx/angle/src/compiler/OutputHLSL.h
1.33 ++++ b/gfx/angle/src/compiler/OutputHLSL.h
1.34 +@@ -11,17 +11,17 @@
1.35 + #include <set>
1.36 + #include <map>
1.37 +
1.38 + #define GL_APICALL
1.39 + #include <GLES2/gl2.h>
1.40 +
1.41 + #include "compiler/intermediate.h"
1.42 + #include "compiler/ParseHelper.h"
1.43 +-#include "compiler/Uniform.h"
1.44 ++#include "compiler/CompilerUniform.h"
1.45 +
1.46 + namespace sh
1.47 + {
1.48 + class UnfoldShortCircuit;
1.49 +
1.50 + class OutputHLSL : public TIntermTraverser
1.51 + {
1.52 + public:
1.53 +diff --git a/gfx/angle/src/compiler/TranslatorHLSL.h b/gfx/angle/src/compiler/TranslatorHLSL.h
1.54 +--- a/gfx/angle/src/compiler/TranslatorHLSL.h
1.55 ++++ b/gfx/angle/src/compiler/TranslatorHLSL.h
1.56 +@@ -3,17 +3,17 @@
1.57 + // Use of this source code is governed by a BSD-style license that can be
1.58 + // found in the LICENSE file.
1.59 + //
1.60 +
1.61 + #ifndef COMPILER_TRANSLATORHLSL_H_
1.62 + #define COMPILER_TRANSLATORHLSL_H_
1.63 +
1.64 + #include "compiler/ShHandle.h"
1.65 +-#include "compiler/Uniform.h"
1.66 ++#include "compiler/CompilerUniform.h"
1.67 +
1.68 + class TranslatorHLSL : public TCompiler {
1.69 + public:
1.70 + TranslatorHLSL(ShShaderType type, ShShaderSpec spec, ShShaderOutput output);
1.71 +
1.72 + virtual TranslatorHLSL *getAsTranslatorHLSL() { return this; }
1.73 + const sh::ActiveUniforms &getUniforms() { return mActiveUniforms; }
1.74 +
1.75 +diff --git a/gfx/angle/src/libGLESv2/Shader.h b/gfx/angle/src/libGLESv2/Shader.h
1.76 +--- a/gfx/angle/src/libGLESv2/Shader.h
1.77 ++++ b/gfx/angle/src/libGLESv2/Shader.h
1.78 +@@ -13,17 +13,17 @@
1.79 + #define LIBGLESV2_SHADER_H_
1.80 +
1.81 + #define GL_APICALL
1.82 + #include <GLES2/gl2.h>
1.83 + #include <string>
1.84 + #include <list>
1.85 + #include <vector>
1.86 +
1.87 +-#include "compiler/Uniform.h"
1.88 ++#include "compiler/CompilerUniform.h"
1.89 + #include "common/angleutils.h"
1.90 +
1.91 + namespace rx
1.92 + {
1.93 + class Renderer;
1.94 + }
1.95 +
1.96 + namespace gl
