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