gfx/angle/angle-build-dedupe-uniform-cpp-h.patch@97036ab72558 (annotated)
gfx/angle/angle-build-dedupe-uniform-cpp-h.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | From: Jeff Gilbert <jgilbert@mozilla.com> |
| michael@0 | 2 | |
| michael@0 | 3 | diff --git a/gfx/angle/src/compiler/Uniform.cpp b/gfx/angle/src/compiler/CompilerUniform.cpp |
| michael@0 | 4 | rename from gfx/angle/src/compiler/Uniform.cpp |
| michael@0 | 5 | rename to gfx/angle/src/compiler/CompilerUniform.cpp |
| michael@0 | 6 | --- a/gfx/angle/src/compiler/Uniform.cpp |
| michael@0 | 7 | +++ b/gfx/angle/src/compiler/CompilerUniform.cpp |
| michael@0 | 8 | @@ -1,15 +1,15 @@ |
| michael@0 | 9 | // |
| michael@0 | 10 | // Copyright (c) 2013 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 11 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 12 | // found in the LICENSE file. |
| michael@0 | 13 | // |
| michael@0 | 14 | |
| michael@0 | 15 | -#include "compiler/Uniform.h" |
| michael@0 | 16 | +#include "CompilerUniform.h" |
| michael@0 | 17 | |
| michael@0 | 18 | namespace sh |
| michael@0 | 19 | { |
| michael@0 | 20 | |
| michael@0 | 21 | Uniform::Uniform(GLenum type, GLenum precision, const char *name, int arraySize, int registerIndex) |
| michael@0 | 22 | { |
| michael@0 | 23 | this->type = type; |
| michael@0 | 24 | this->precision = precision; |
| michael@0 | 25 | diff --git a/gfx/angle/src/compiler/Uniform.h b/gfx/angle/src/compiler/CompilerUniform.h |
| michael@0 | 26 | rename from gfx/angle/src/compiler/Uniform.h |
| michael@0 | 27 | rename to gfx/angle/src/compiler/CompilerUniform.h |
| michael@0 | 28 | diff --git a/gfx/angle/src/compiler/OutputHLSL.h b/gfx/angle/src/compiler/OutputHLSL.h |
| michael@0 | 29 | --- a/gfx/angle/src/compiler/OutputHLSL.h |
| michael@0 | 30 | +++ b/gfx/angle/src/compiler/OutputHLSL.h |
| michael@0 | 31 | @@ -11,17 +11,17 @@ |
| michael@0 | 32 | #include <set> |
| michael@0 | 33 | #include <map> |
| michael@0 | 34 | |
| michael@0 | 35 | #define GL_APICALL |
| michael@0 | 36 | #include <GLES2/gl2.h> |
| michael@0 | 37 | |
| michael@0 | 38 | #include "compiler/intermediate.h" |
| michael@0 | 39 | #include "compiler/ParseHelper.h" |
| michael@0 | 40 | -#include "compiler/Uniform.h" |
| michael@0 | 41 | +#include "compiler/CompilerUniform.h" |
| michael@0 | 42 | |
| michael@0 | 43 | namespace sh |
| michael@0 | 44 | { |
| michael@0 | 45 | class UnfoldShortCircuit; |
| michael@0 | 46 | |
| michael@0 | 47 | class OutputHLSL : public TIntermTraverser |
| michael@0 | 48 | { |
| michael@0 | 49 | public: |
| michael@0 | 50 | diff --git a/gfx/angle/src/compiler/TranslatorHLSL.h b/gfx/angle/src/compiler/TranslatorHLSL.h |
| michael@0 | 51 | --- a/gfx/angle/src/compiler/TranslatorHLSL.h |
| michael@0 | 52 | +++ b/gfx/angle/src/compiler/TranslatorHLSL.h |
| michael@0 | 53 | @@ -3,17 +3,17 @@ |
| michael@0 | 54 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 55 | // found in the LICENSE file. |
| michael@0 | 56 | // |
| michael@0 | 57 | |
| michael@0 | 58 | #ifndef COMPILER_TRANSLATORHLSL_H_ |
| michael@0 | 59 | #define COMPILER_TRANSLATORHLSL_H_ |
| michael@0 | 60 | |
| michael@0 | 61 | #include "compiler/ShHandle.h" |
| michael@0 | 62 | -#include "compiler/Uniform.h" |
| michael@0 | 63 | +#include "compiler/CompilerUniform.h" |
| michael@0 | 64 | |
| michael@0 | 65 | class TranslatorHLSL : public TCompiler { |
| michael@0 | 66 | public: |
| michael@0 | 67 | TranslatorHLSL(ShShaderType type, ShShaderSpec spec, ShShaderOutput output); |
| michael@0 | 68 | |
| michael@0 | 69 | virtual TranslatorHLSL *getAsTranslatorHLSL() { return this; } |
| michael@0 | 70 | const sh::ActiveUniforms &getUniforms() { return mActiveUniforms; } |
| michael@0 | 71 | |
| michael@0 | 72 | diff --git a/gfx/angle/src/libGLESv2/Shader.h b/gfx/angle/src/libGLESv2/Shader.h |
| michael@0 | 73 | --- a/gfx/angle/src/libGLESv2/Shader.h |
| michael@0 | 74 | +++ b/gfx/angle/src/libGLESv2/Shader.h |
| michael@0 | 75 | @@ -13,17 +13,17 @@ |
| michael@0 | 76 | #define LIBGLESV2_SHADER_H_ |
| michael@0 | 77 | |
| michael@0 | 78 | #define GL_APICALL |
| michael@0 | 79 | #include <GLES2/gl2.h> |
| michael@0 | 80 | #include <string> |
| michael@0 | 81 | #include <list> |
| michael@0 | 82 | #include <vector> |
| michael@0 | 83 | |
| michael@0 | 84 | -#include "compiler/Uniform.h" |
| michael@0 | 85 | +#include "compiler/CompilerUniform.h" |
| michael@0 | 86 | #include "common/angleutils.h" |
| michael@0 | 87 | |
| michael@0 | 88 | namespace rx |
| michael@0 | 89 | { |
| michael@0 | 90 | class Renderer; |
| michael@0 | 91 | } |
| michael@0 | 92 | |
| michael@0 | 93 | namespace gl |
