gfx/angle/angle-build-d3dcompiler-list.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.

     1 From: Jeff Gilbert <jgilbert@mozilla.com>
     3 diff --git a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
     4 --- a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
     5 +++ b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
     6 @@ -15,16 +15,23 @@
     7  #include "libGLESv2/renderer/Renderer11.h"
     8  #include "libGLESv2/utilities.h"
    10  #if !defined(ANGLE_ENABLE_D3D11)
    11  // Enables use of the Direct3D 11 API for a default display, when available
    12  #define ANGLE_ENABLE_D3D11 0
    13  #endif
    15 +#define ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES \
    16 +    {                                            \
    17 +        TEXT("d3dcompiler_46.dll"),              \
    18 +        TEXT("d3dcompiler_43.dll")               \
    19 +    }
    20 +
    21 +
    22  namespace rx
    23  {
    25  Renderer::Renderer(egl::Display *display) : mDisplay(display)
    26  {
    27      mD3dCompilerModule = NULL;
    28      mD3DCompileFunc = NULL;
    29  }
    30 @@ -212,9 +219,9 @@ rx::Renderer *glCreateRenderer(egl::Disp
    31      return NULL;
    32  }
    34  void glDestroyRenderer(rx::Renderer *renderer)
    35  {
    36      delete renderer;
    37  }
    39 -}
    40 \ No newline at end of file
    41 +}

mercurial