Cast display parm for eglGetPlatformDisplayEXT.

The native display parameter to eglGetPlatformDisplayEXT has type void*. When building with -DUSE_OZONE the native display type is intptr_t so a cast is needed. BUG=angleproject:1297 Change-Id: I947f5f9016926b6e3d590a2e29b5ee1fc883384d Reviewed-on: https://chromium-review.googlesource.com/323471Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Frank Henigman <fjhenigman@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Tested-by: Frank Henigman <fjhenigman@chromium.org>

Cast display parm for eglGetPlatformDisplayEXT.
82e3f3de · Frank Henigman · 5b74bd39 · 82e3f3de · 82e3f3de · 82e3f3de
Commit 82e3f3de authored Jan 22, 2016 by Frank Henigman
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

EGLSurfaceTest.cpp src/tests/egl_tests/EGLSurfaceTest.cpp +3 -1

EGLInitializePerf.cpp src/tests/perf_tests/EGLInitializePerf.cpp +1 -1

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

No files found.
--- a/src/tests/egl_tests/EGLSurfaceTest.cpp
+++ b/src/tests/egl_tests/EGLSurfaceTest.cpp
@@ -97,7 +97,9 @@ class EGLSurfaceTest : public testing::Test
        }
        displayAttributes.push_back(EGL_NONE);

-        mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, mOSWindow->getNativeDisplay(), displayAttributes.data());
+        mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
+                                            reinterpret_cast<void *>(mOSWindow->getNativeDisplay()),
+                                            displayAttributes.data());
        ASSERT_TRUE(mDisplay != EGL_NO_DISPLAY);

        EGLint majorVersion, minorVersion;

--- a/src/tests/perf_tests/EGLInitializePerf.cpp
+++ b/src/tests/perf_tests/EGLInitializePerf.cpp
@@ -121,7 +121,7 @@ EGLInitializePerfTest::EGLInitializePerfTest()
    }

    mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
-                                        mOSWindow->getNativeDisplay(),
+                                        reinterpret_cast<void *>(mOSWindow->getNativeDisplay()),
                                        &displayAttributes[0]);

    ANGLEPlatformInitialize(&mCapturePlatform);

--- a/util/EGLWindow.cpp
+++ b/util/EGLWindow.cpp
@@ -143,7 +143,9 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
    }
    displayAttributes.push_back(EGL_NONE);

-    mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, osWindow->getNativeDisplay(), &displayAttributes[0]);
+    mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
+                                        reinterpret_cast<void *>(osWindow->getNativeDisplay()),
+                                        &displayAttributes[0]);
    if (mDisplay == EGL_NO_DISPLAY)
    {
        destroyGL();