[WinCairo][ANGLE] Display object is not created.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Apr 2016 21:47:20 +0000 (21:47 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Apr 2016 21:47:20 +0000 (21:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=157042

Reviewed by Alex Christensen.

The CreateDisplayFromAttribs function will not create a DisplayD3D object when the requested
type is EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE, because ANGLE_ENABLE_OPENGL is not defined.
We should be able to create a DisplayD3D object without defining ANGLE_ENABLE_OPENGL.

* src/libANGLE/Display.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@200107 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp

index 98b6413..b3c6b2a 100644 (file)
@@ -1,5 +1,18 @@
 2016-04-26  Per Arne Vollan  <peavo@outlook.com>
 
+        [WinCairo][ANGLE] Display object is not created.
+        https://bugs.webkit.org/show_bug.cgi?id=157042
+
+        Reviewed by Alex Christensen.
+
+        The CreateDisplayFromAttribs function will not create a DisplayD3D object when the requested
+        type is EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE, because ANGLE_ENABLE_OPENGL is not defined.
+        We should be able to create a DisplayD3D object without defining ANGLE_ENABLE_OPENGL.
+
+        * src/libANGLE/Display.cpp:
+
+2016-04-26  Per Arne Vollan  <peavo@outlook.com>
+
         [WinCairo][WebGL] Enable ESSL and GLSL translators.
         https://bugs.webkit.org/show_bug.cgi?id=157002
 
index 4de579b..673849e 100644 (file)
@@ -139,19 +139,17 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap)
     switch (displayType)
     {
       case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
-#if defined(ANGLE_ENABLE_OPENGL)
 #if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
         // Default to D3D displays
         impl = new rx::DisplayD3D();
-#elif defined(ANGLE_USE_X11)
+#elif defined(ANGLE_USE_X11) && defined(ANGLE_ENABLE_OPENGL)
         impl = new rx::DisplayGLX();
-#elif defined(ANGLE_PLATFORM_APPLE)
+#elif defined(ANGLE_PLATFORM_APPLE) && defined(ANGLE_ENABLE_OPENGL)
         impl = new rx::DisplayCGL();
 #else
         // No display available
         UNREACHABLE();
 #endif
-#endif
         break;
 
       case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE: