gfx/angle/angle-d3dcc47.patch
author Thomas Zimmermann <tdz@users.sourceforge.net>
Thu, 17 Apr 2014 11:16:12 +0200
changeset 179011 7113f6dd5cdc328cdb5b017d0edd4732db5d58cd
parent 173308 93f528b049ef0c8f45b872ea4fb4640912da97f6
permissions -rw-r--r--
Bug 995912: Remove BLUEZ_DBUS_BASE_IFC from RawDBusConnection, r=qdot, echou This patch removes the constant BLUEZ_DBUS_BASE_IFC from the file RawDBusconnection.cpp. The constant is specific to BlueZ, and that's where it's located now.

From: Jeff Gilbert <jgilbert@mozilla.com>
Bug 982973 - Tell ANGLE about d3dcompiler_47.dll. - r=vlad

diff --git a/gfx/angle/src/libGLESv2/renderer/Renderer.cpp b/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;