author | Jeff Gilbert <jdashg@gmail.com> |
Mon, 21 Mar 2016 10:49:23 -0700 | |
changeset 289633 | 96e8d52b4b017e9b9e9a210683dc837a2025f5f8 |
parent 289632 | 74312d99d538b934c2d47e32f3e272bc78d3208a |
child 289634 | b6b2fc1bbac7b625c6020f8733923f76559e0aef |
push id | 73928 |
push user | gszorc@mozilla.com |
push date | Mon, 21 Mar 2016 17:56:32 +0000 |
treeherder | mozilla-inbound@96e8d52b4b01 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jrmuizel |
bugs | 1256492 |
milestone | 48.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/gl/SharedSurfaceEGL.cpp +++ b/gfx/gl/SharedSurfaceEGL.cpp @@ -34,17 +34,17 @@ SharedSurface_EGLImage::Create(GLContext } MOZ_ALWAYS_TRUE(prodGL->MakeCurrent()); GLuint prodTex = CreateTextureForOffscreen(prodGL, formats, size); if (!prodTex) { return Move(ret); } - EGLClientBuffer buffer = reinterpret_cast<EGLClientBuffer>(prodTex); + EGLClientBuffer buffer = reinterpret_cast<EGLClientBuffer>(uintptr_t(prodTex)); EGLImage image = egl->fCreateImage(egl->Display(), context, LOCAL_EGL_GL_TEXTURE_2D, buffer, nullptr); if (!image) { prodGL->fDeleteTextures(1, &prodTex); return Move(ret); }