gfx/angle/angle-d3dcc47.patch@129ffea94266 (annotated)
gfx/angle/angle-d3dcc47.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | From: Jeff Gilbert <jgilbert@mozilla.com> |
| michael@0 | 2 | Bug 982973 - Tell ANGLE about d3dcompiler_47.dll. - r=vlad |
| michael@0 | 3 | |
| michael@0 | 4 | diff --git a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp |
| michael@0 | 5 | --- a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp |
| michael@0 | 6 | +++ b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp |
| michael@0 | 7 | @@ -17,16 +17,17 @@ |
| michael@0 | 8 | |
| michael@0 | 9 | #if !defined(ANGLE_ENABLE_D3D11) |
| michael@0 | 10 | // Enables use of the Direct3D 11 API for a default display, when available |
| michael@0 | 11 | #define ANGLE_ENABLE_D3D11 0 |
| michael@0 | 12 | #endif |
| michael@0 | 13 | |
| michael@0 | 14 | #define ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES \ |
| michael@0 | 15 | { \ |
| michael@0 | 16 | + TEXT("d3dcompiler_47.dll"), \ |
| 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 | @@ -173,23 +174,23 @@ ShaderBlob *Renderer::compileToBinary(gl |
| michael@0 | 26 | |
| michael@0 | 27 | extern "C" |
| michael@0 | 28 | { |
| michael@0 | 29 | |
| michael@0 | 30 | rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, EGLNativeDisplayType displayId) |
| michael@0 | 31 | { |
| michael@0 | 32 | rx::Renderer *renderer = NULL; |
| michael@0 | 33 | EGLint status = EGL_BAD_ALLOC; |
| michael@0 | 34 | - |
| michael@0 | 35 | + |
| michael@0 | 36 | if (ANGLE_ENABLE_D3D11 || |
| michael@0 | 37 | displayId == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE || |
| michael@0 | 38 | displayId == EGL_D3D11_ONLY_DISPLAY_ANGLE) |
| michael@0 | 39 | { |
| michael@0 | 40 | renderer = new rx::Renderer11(display, hDc); |
| michael@0 | 41 | - |
| michael@0 | 42 | + |
| michael@0 | 43 | if (renderer) |
| michael@0 | 44 | { |
| michael@0 | 45 | status = renderer->initialize(); |
| michael@0 | 46 | } |
| michael@0 | 47 | |
| michael@0 | 48 | if (status == EGL_SUCCESS) |
| michael@0 | 49 | { |
| michael@0 | 50 | return renderer; |
| michael@0 | 51 | @@ -200,17 +201,17 @@ rx::Renderer *glCreateRenderer(egl::Disp |
| michael@0 | 52 | } |
| michael@0 | 53 | |
| michael@0 | 54 | // Failed to create a D3D11 renderer, try creating a D3D9 renderer |
| michael@0 | 55 | delete renderer; |
| michael@0 | 56 | } |
| michael@0 | 57 | |
| michael@0 | 58 | bool softwareDevice = (displayId == EGL_SOFTWARE_DISPLAY_ANGLE); |
| michael@0 | 59 | renderer = new rx::Renderer9(display, hDc, softwareDevice); |
| michael@0 | 60 | - |
| michael@0 | 61 | + |
| michael@0 | 62 | if (renderer) |
| michael@0 | 63 | { |
| michael@0 | 64 | status = renderer->initialize(); |
| michael@0 | 65 | } |
| michael@0 | 66 | |
| michael@0 | 67 | if (status == EGL_SUCCESS) |
| michael@0 | 68 | { |
| michael@0 | 69 | return renderer; |
