gfx/angle/angle-build-d3dcompiler-list.patch
author Thomas Zimmermann <tdz@users.sourceforge.net>
Thu, 17 Apr 2014 11:16:12 +0200
changeset 179011 7113f6dd5cdc328cdb5b017d0edd4732db5d58cd
parent 146042 356866ae2f6885933451a92aae838af00d659679
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>

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
@@ -15,16 +15,23 @@
 #include "libGLESv2/renderer/Renderer11.h"
 #include "libGLESv2/utilities.h"
 
 #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_46.dll"),              \
+        TEXT("d3dcompiler_43.dll")               \
+    }
+
+
 namespace rx
 {
 
 Renderer::Renderer(egl::Display *display) : mDisplay(display)
 {
     mD3dCompilerModule = NULL;
     mD3DCompileFunc = NULL;
 }
@@ -212,9 +219,9 @@ rx::Renderer *glCreateRenderer(egl::Disp
     return NULL;
 }
 
 void glDestroyRenderer(rx::Renderer *renderer)
 {
     delete renderer;
 }
 
-}
\ No newline at end of file
+}