diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-13 15:26:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 15:26:10 +0000 |
| commit | d4dabf872ac0a12e12aebae9032f7d62762c2aeb (patch) | |
| tree | a4c803ecda0a5ddb4655ba135e175d1f57f3d17c /opengl/libs/EGL/egl_display.cpp | |
| parent | ffd353a73eb7794ef556c4e646f866b580a03abb (diff) | |
| parent | cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba (diff) | |
| download | frameworks_native-d4dabf872ac0a12e12aebae9032f7d62762c2aeb.zip frameworks_native-d4dabf872ac0a12e12aebae9032f7d62762c2aeb.tar.gz frameworks_native-d4dabf872ac0a12e12aebae9032f7d62762c2aeb.tar.bz2 | |
am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
Diffstat (limited to 'opengl/libs/EGL/egl_display.cpp')
| -rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index 26240f1..7784ca6 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -313,7 +313,7 @@ void egl_display_t::loseCurrentImpl(egl_context_t * cur_c) } EGLBoolean egl_display_t::makeCurrent(egl_context_t* c, egl_context_t* cur_c, - EGLSurface draw, EGLSurface read, EGLContext ctx, + EGLSurface draw, EGLSurface read, EGLContext /*ctx*/, EGLSurface impl_draw, EGLSurface impl_read, EGLContext impl_ctx) { EGLBoolean result; |