diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-13 23:12:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 23:12:09 +0000 |
| commit | 993146092f8205d9747f082ccd63c09b536caa4e (patch) | |
| tree | 89d07eb2647268606632e10e6c9add64b30f7b84 /opengl/libs/EGL | |
| parent | 49bfda1fbdf828a8ea63ae2c2fa25739f6e48527 (diff) | |
| parent | d4dabf872ac0a12e12aebae9032f7d62762c2aeb (diff) | |
| download | frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.tar.gz frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.tar.bz2 frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.zip | |
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
Diffstat (limited to 'opengl/libs/EGL')
| -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 26240f1bc..7784ca6ac 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; |