michael@0: From: Jeff Gilbert <jgilbert@mozilla.com>
michael@0: Bug 982973 - Tell ANGLE about d3dcompiler_47.dll. - r=vlad
michael@0: 
michael@0: diff --git a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
michael@0: --- a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
michael@0: +++ b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
michael@0: @@ -17,16 +17,17 @@
michael@0:  
michael@0:  #if !defined(ANGLE_ENABLE_D3D11)
michael@0:  // Enables use of the Direct3D 11 API for a default display, when available
michael@0:  #define ANGLE_ENABLE_D3D11 0
michael@0:  #endif
michael@0:  
michael@0:  #define ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES \
michael@0:      {                                            \
michael@0: +        TEXT("d3dcompiler_47.dll"),              \
michael@0:          TEXT("d3dcompiler_46.dll"),              \
michael@0:          TEXT("d3dcompiler_43.dll")               \
michael@0:      }
michael@0:  
michael@0:  
michael@0:  namespace rx
michael@0:  {
michael@0:  
michael@0: @@ -173,23 +174,23 @@ ShaderBlob *Renderer::compileToBinary(gl
michael@0:  
michael@0:  extern "C"
michael@0:  {
michael@0:  
michael@0:  rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, EGLNativeDisplayType displayId)
michael@0:  {
michael@0:      rx::Renderer *renderer = NULL;
michael@0:      EGLint status = EGL_BAD_ALLOC;
michael@0: -    
michael@0: +
michael@0:      if (ANGLE_ENABLE_D3D11 ||
michael@0:          displayId == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
michael@0:          displayId == EGL_D3D11_ONLY_DISPLAY_ANGLE)
michael@0:      {
michael@0:          renderer = new rx::Renderer11(display, hDc);
michael@0: -    
michael@0: +
michael@0:          if (renderer)
michael@0:          {
michael@0:              status = renderer->initialize();
michael@0:          }
michael@0:  
michael@0:          if (status == EGL_SUCCESS)
michael@0:          {
michael@0:              return renderer;
michael@0: @@ -200,17 +201,17 @@ rx::Renderer *glCreateRenderer(egl::Disp
michael@0:          }
michael@0:  
michael@0:          // Failed to create a D3D11 renderer, try creating a D3D9 renderer
michael@0:          delete renderer;
michael@0:      }
michael@0:  
michael@0:      bool softwareDevice = (displayId == EGL_SOFTWARE_DISPLAY_ANGLE);
michael@0:      renderer = new rx::Renderer9(display, hDc, softwareDevice);
michael@0: -    
michael@0: +
michael@0:      if (renderer)
michael@0:      {
michael@0:          status = renderer->initialize();
michael@0:      }
michael@0:  
michael@0:      if (status == EGL_SUCCESS)
michael@0:      {
michael@0:          return renderer;