Use GetPlatformDisplay instead of GetPlatformDisplayEXT.

src/libANGLE/renderer/d3d/HLSLCompiler.cpp

@@ -219,7 +219,7 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
             infoLog.appendSanitized(message.c_str());
 
             // This produces unbelievable amounts of spam in about:gpu.
-            //WARN() << std::endl << hlsl;
+            // WARN() << std::endl << hlsl;
 
             WARN() << std::endl << message;
 

src/libANGLE/validationEGL.h

@@ -123,7 +123,12 @@ Error ValidateCompatibleConfigs(const Display *display,
                                 const Config *config2,
                                 EGLint surfaceType);
 
-Error ValidatePlatformType(const ClientExtensions &clientExtensions, EGLint platformType);
-}  // namespace gl
+Error ValidateGetPlatformDisplay(EGLenum platform,
+                                 void *native_display,
+                                 const EGLAttrib *attrib_list);
+Error ValidateGetPlatformDisplayEXT(EGLenum platform,
+                                    void *native_display,
+                                    const EGLint *attrib_list);
+}  // namespace egl
 
 #endif // LIBANGLE_VALIDATIONEGL_H_

src/libGLESv2/entry_points_egl.cpp

@@ -1196,9 +1196,29 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform,
         platform, native_display, attrib_list);
     Thread *thread = GetCurrentThread();
 
-    UNIMPLEMENTED();
-    thread->setError(Error(EGL_BAD_DISPLAY, "eglGetPlatformDisplay unimplemented."));
-    return EGL_NO_DISPLAY;
+    Error err = ValidateGetPlatformDisplay(platform, native_display, attrib_list);
+    thread->setError(err);
+    if (err.isError())
+    {
+        return EGL_NO_DISPLAY;
+    }
+
+    if (platform == EGL_PLATFORM_ANGLE_ANGLE)
+    {
+        return Display::GetDisplayFromNativeDisplay(
+            gl::bitCast<EGLNativeDisplayType>(native_display),
+            AttributeMap::CreateFromAttribArray(attrib_list));
+    }
+    else if (platform == EGL_PLATFORM_DEVICE_EXT)
+    {
+        Device *eglDevice = reinterpret_cast<Device *>(native_display);
+        return Display::GetDisplayFromDevice(eglDevice);
+    }
+    else
+    {
+        UNREACHABLE();
+        return EGL_NO_DISPLAY;
+    }
 }
 
 EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy,

util/EGLWindow.cpp

@@ -161,13 +161,7 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
 
 bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
 {
-    PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
-    if (!eglGetPlatformDisplayEXT)
-    {
-        return false;
-    }
-
-    std::vector<EGLint> displayAttributes;
+    std::vector<EGLAttrib> displayAttributes;
     displayAttributes.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
     displayAttributes.push_back(mPlatform.renderer);
     displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
@@ -204,9 +198,9 @@ bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
 
     displayAttributes.push_back(EGL_NONE);
 
-    mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
-                                        reinterpret_cast<void *>(osWindow->getNativeDisplay()),
-                                        &displayAttributes[0]);
+    mDisplay = eglGetPlatformDisplay(EGL_PLATFORM_ANGLE_ANGLE,
+                                     reinterpret_cast<void *>(osWindow->getNativeDisplay()),
+                                     &displayAttributes[0]);
     if (mDisplay == EGL_NO_DISPLAY)
     {
         destroyGL();