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 | |
parent | 49bfda1fbdf828a8ea63ae2c2fa25739f6e48527 (diff) | |
parent | d4dabf872ac0a12e12aebae9032f7d62762c2aeb (diff) | |
download | frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.zip frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.tar.gz frameworks_native-993146092f8205d9747f082ccd63c09b536caa4e.tar.bz2 |
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
native frameworks: 64-bit compile issues
Diffstat (limited to 'opengl/libs')
-rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 2 | ||||
-rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 14 | ||||
-rw-r--r-- | opengl/libs/GLES_trace/src/gltrace_egl.cpp | 2 |
3 files changed, 9 insertions, 9 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; diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index 18ef6f9..893577b 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -53,34 +53,34 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type, } void glColorPointerBounds(GLint size, GLenum type, GLsizei stride, - const GLvoid *ptr, GLsizei count) { + const GLvoid *ptr, GLsizei /*count*/) { glColorPointer(size, type, stride, ptr); } void glNormalPointerBounds(GLenum type, GLsizei stride, - const GLvoid *pointer, GLsizei count) { + const GLvoid *pointer, GLsizei /*count*/) { glNormalPointer(type, stride, pointer); } void glTexCoordPointerBounds(GLint size, GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count) { + GLsizei stride, const GLvoid *pointer, GLsizei /*count*/) { glTexCoordPointer(size, type, stride, pointer); } void glVertexPointerBounds(GLint size, GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count) { + GLsizei stride, const GLvoid *pointer, GLsizei /*count*/) { glVertexPointer(size, type, stride, pointer); } void GL_APIENTRY glPointSizePointerOESBounds(GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count) { + GLsizei stride, const GLvoid *pointer, GLsizei /*count*/) { glPointSizePointerOES(type, stride, pointer); } GL_API void GL_APIENTRY glMatrixIndexPointerOESBounds(GLint size, GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count) { + GLsizei stride, const GLvoid *pointer, GLsizei /*count*/) { glMatrixIndexPointerOES(size, type, stride, pointer); } GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type, - GLsizei stride, const GLvoid *pointer, GLsizei count) { + GLsizei stride, const GLvoid *pointer, GLsizei /*count*/) { glWeightPointerOES(size, type, stride, pointer); } diff --git a/opengl/libs/GLES_trace/src/gltrace_egl.cpp b/opengl/libs/GLES_trace/src/gltrace_egl.cpp index 9d1682a..4f9b006 100644 --- a/opengl/libs/GLES_trace/src/gltrace_egl.cpp +++ b/opengl/libs/GLES_trace/src/gltrace_egl.cpp @@ -71,7 +71,7 @@ void GLTrace_eglMakeCurrent(int contextId) { glContext->traceGLMessage(&glmessage); } -void GLTrace_eglSwapBuffers(void *dpy, void *draw) { +void GLTrace_eglSwapBuffers(void* /*dpy*/, void* /*draw*/) { GLMessage glmessage; GLTraceContext *glContext = getGLTraceContext(); |