Bug 950903 - 8/8 - Make CanvasLayerD3D10 not try to use ANGLE shared …

…handles with WGL - r=jgilbert
mozilla-spidermonkey · Jan 7, 2014 · c953c6f · c953c6f
1 parent 685b23a
commit c953c6f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/gfx/layers/d3d10/CanvasLayerD3D10.cpp b/gfx/layers/d3d10/CanvasLayerD3D10.cpp
@@ -59,9 +59,15 @@ CanvasLayerD3D10::Initialize(const Data& aData)
 
     SurfaceFactory_GL* factory = nullptr;
     if (!mForceReadback) {
-      factory = SurfaceFactory_ANGLEShareHandle::Create(mGLContext,
-                                                        device(),
-                                                        screen->Caps());
+      if (mGLContext->IsANGLE()) {
+        factory = SurfaceFactory_ANGLEShareHandle::Create(mGLContext,
+                                                          device(),
+                                                          screen->Caps());
+      } else {
+        factory = new SurfaceFactory_GLTexture(mGLContext,
+                                               nullptr,
+                                               screen->Caps());
+      }
     }
 
     if (factory) {