Commit e701dcc8 by Corentin Wallez Committed by Commit Bot

Fix compilation of dEQP on OSX after a roll of EGL headers

dEQP assumes EGLNativeDisplayType is a pointer, but EGL recently defined it to be an integer. BUG=angleproject:1707 Change-Id: Ief68c763ce159db44f4008cced47e87d92342861 Reviewed-on: https://chromium-review.googlesource.com/434761Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
parent 4ddf5afb
......@@ -72,7 +72,14 @@ class ANGLENativeDisplay : public eglu::NativeDisplay
ANGLENativeDisplay(const std::vector<eglw::EGLAttrib> &attribs);
virtual ~ANGLENativeDisplay() {}
void *getPlatformNative() override { return mDeviceContext; }
void *getPlatformNative() override
{
// On OSX 64bits mDeviceContext is a 32 bit integer, so we can't simply
// use reinterpret_cast<void*>.
void *result = nullptr;
memcpy(&result, &mDeviceContext, sizeof(mDeviceContext));
return result;
}
const eglw::EGLAttrib *getPlatformAttributes() const override { return &mPlatformAttributes[0]; }
const eglw::Library &getLibrary() const override { return mLibrary; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment