Bug 982973 - Tell ANGLE about d3dcompiler_47.dll. - r=vlad
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 12 Mar 2014 19:47:07 -0700
changeset 191523 9dd901bbbd4d0a6635c0f19e1209e60581ef7029
parent 191522 643296ae30594e18ae09042844cd9186357e92c0
child 191524 93f528b049ef0c8f45b872ea4fb4640912da97f6
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvlad
bugs982973
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 982973 - Tell ANGLE about d3dcompiler_47.dll. - r=vlad
gfx/angle/src/libGLESv2/renderer/Renderer.cpp
--- a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
+++ b/gfx/angle/src/libGLESv2/renderer/Renderer.cpp
@@ -17,16 +17,17 @@
 
 #if !defined(ANGLE_ENABLE_D3D11)
 // Enables use of the Direct3D 11 API for a default display, when available
 #define ANGLE_ENABLE_D3D11 0
 #endif
 
 #define ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES \
     {                                            \
+        TEXT("d3dcompiler_47.dll"),              \
         TEXT("d3dcompiler_46.dll"),              \
         TEXT("d3dcompiler_43.dll")               \
     }
 
 
 namespace rx
 {
 
@@ -173,23 +174,23 @@ ShaderBlob *Renderer::compileToBinary(gl
 
 extern "C"
 {
 
 rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, EGLNativeDisplayType displayId)
 {
     rx::Renderer *renderer = NULL;
     EGLint status = EGL_BAD_ALLOC;
-    
+
     if (ANGLE_ENABLE_D3D11 ||
         displayId == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
         displayId == EGL_D3D11_ONLY_DISPLAY_ANGLE)
     {
         renderer = new rx::Renderer11(display, hDc);
-    
+
         if (renderer)
         {
             status = renderer->initialize();
         }
 
         if (status == EGL_SUCCESS)
         {
             return renderer;
@@ -200,17 +201,17 @@ rx::Renderer *glCreateRenderer(egl::Disp
         }
 
         // Failed to create a D3D11 renderer, try creating a D3D9 renderer
         delete renderer;
     }
 
     bool softwareDevice = (displayId == EGL_SOFTWARE_DISPLAY_ANGLE);
     renderer = new rx::Renderer9(display, hDc, softwareDevice);
-    
+
     if (renderer)
     {
         status = renderer->initialize();
     }
 
     if (status == EGL_SUCCESS)
     {
         return renderer;