The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/angle/angle-d3dcc47.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,69 @@
     1.4 +From: Jeff Gilbert <jgilbert@mozilla.com>
     1.5 +Bug 982973 - Tell ANGLE about d3dcompiler_47.dll. - r=vlad
     1.6 +
     1.7 +diff --git a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
     1.8 +--- a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
     1.9 ++++ b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
    1.10 +@@ -17,16 +17,17 @@
    1.11 + 
    1.12 + #if !defined(ANGLE_ENABLE_D3D11)
    1.13 + // Enables use of the Direct3D 11 API for a default display, when available
    1.14 + #define ANGLE_ENABLE_D3D11 0
    1.15 + #endif
    1.16 + 
    1.17 + #define ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES \
    1.18 +     {                                            \
    1.19 ++        TEXT("d3dcompiler_47.dll"),              \
    1.20 +         TEXT("d3dcompiler_46.dll"),              \
    1.21 +         TEXT("d3dcompiler_43.dll")               \
    1.22 +     }
    1.23 + 
    1.24 + 
    1.25 + namespace rx
    1.26 + {
    1.27 + 
    1.28 +@@ -173,23 +174,23 @@ ShaderBlob *Renderer::compileToBinary(gl
    1.29 + 
    1.30 + extern "C"
    1.31 + {
    1.32 + 
    1.33 + rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, EGLNativeDisplayType displayId)
    1.34 + {
    1.35 +     rx::Renderer *renderer = NULL;
    1.36 +     EGLint status = EGL_BAD_ALLOC;
    1.37 +-    
    1.38 ++
    1.39 +     if (ANGLE_ENABLE_D3D11 ||
    1.40 +         displayId == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
    1.41 +         displayId == EGL_D3D11_ONLY_DISPLAY_ANGLE)
    1.42 +     {
    1.43 +         renderer = new rx::Renderer11(display, hDc);
    1.44 +-    
    1.45 ++
    1.46 +         if (renderer)
    1.47 +         {
    1.48 +             status = renderer->initialize();
    1.49 +         }
    1.50 + 
    1.51 +         if (status == EGL_SUCCESS)
    1.52 +         {
    1.53 +             return renderer;
    1.54 +@@ -200,17 +201,17 @@ rx::Renderer *glCreateRenderer(egl::Disp
    1.55 +         }
    1.56 + 
    1.57 +         // Failed to create a D3D11 renderer, try creating a D3D9 renderer
    1.58 +         delete renderer;
    1.59 +     }
    1.60 + 
    1.61 +     bool softwareDevice = (displayId == EGL_SOFTWARE_DISPLAY_ANGLE);
    1.62 +     renderer = new rx::Renderer9(display, hDc, softwareDevice);
    1.63 +-    
    1.64 ++
    1.65 +     if (renderer)
    1.66 +     {
    1.67 +         status = renderer->initialize();
    1.68 +     }
    1.69 + 
    1.70 +     if (status == EGL_SUCCESS)
    1.71 +     {
    1.72 +         return renderer;