The Tor Browser / file comparison
comparison: gfx/angle/angle-build-d3dcompiler-list.patch
gfx/angle/angle-build-d3dcompiler-list.patch
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
equal
deleted
inserted
replaced
| -1:000000000000 | 0:0c9947806674 |
|---|---|
| 1 From: Jeff Gilbert <jgilbert@mozilla.com> | |
| 2 | |
| 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" | |
| 9 | |
| 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 | |
| 14 | |
| 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 { | |
| 24 | |
| 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 } | |
| 33 | |
| 34 void glDestroyRenderer(rx::Renderer *renderer) | |
| 35 { | |
| 36 delete renderer; | |
| 37 } | |
| 38 | |
| 39 -} | |
| 40 \ No newline at end of file | |
| 41 +} |
