gfx/angle/angle-build-d3dcompiler-list.patch
author B2G Bumper Bot <release+b2gbumper@mozilla.com>
Mon, 09 Jun 2014 01:46:12 -0700
changeset 206794 d8bcbb0d8cc495418700c4f508cda13fef1f0f30
parent 158949 356866ae2f6885933451a92aae838af00d659679
permissions -rw-r--r--
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/158e218cc9ec Author: Arthur Chen <crh0716@gmail.com> Desc: Merge pull request #20064 from crh0716/1016219 Bug 1016219 - Call to specific panel function when visibility changes r=eragon ======== https://hg.mozilla.org/integration/gaia-central/rev/58cf2e2cd4e1 Author: Arthur Chen <crh0716@gmail.com> Desc: Bug 1016219 - Call to specific panel function when visibility changes

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
+}