Revert "Fix pointer to int conversion warning in EGLWindow.cpp"

Causes a compile error. BUG=angleproject:892 This reverts commit d424da4a. Change-Id: Ieb8bb99d02f7050306974db5dab72d26474891ac Reviewed-on: https://chromium-review.googlesource.com/268996Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Revert "Fix pointer to int conversion warning in EGLWindow.cpp"
c07c43e4 · Jamie Madill · 72196b74 · c07c43e4
Commit c07c43e4 authored May 04, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

EGLWindow.cpp util/EGLWindow.cpp +6 -1

No files found.
--- a/util/EGLWindow.cpp
+++ b/util/EGLWindow.cpp
@@ -167,12 +167,17 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
    surfaceAttributes.push_back(EGL_NONE);
    mSurface = eglCreateWindowSurface(mDisplay, mConfig, osWindow->getNativeWindow(), &surfaceAttributes[0]);
+    if (mSurface == EGL_NO_SURFACE)
+    {
+        eglGetError(); // Clear error and try again
+        mSurface = eglCreateWindowSurface(mDisplay, mConfig, NULL, NULL);
+    }
    if (eglGetError() != EGL_SUCCESS)
    {
        destroyGL();
        return false;
    }
-    ASSERT(mSurface != EGL_NO_SURFACE);
    EGLint contextAttibutes[] =
    {