diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-25 23:00:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 23:00:44 +0000 |
| commit | 8d31934148301b449d1b6277e25a6c3a8d162dff (patch) | |
| tree | b0ec75b1cb05e3b8f601ad0fcef7f7fd5c486186 /opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp | |
| parent | a455ec21fa5341b8cee09eff73a9b465a6c28faa (diff) | |
| parent | 797498450cbcb87c28636e775ada942005436909 (diff) | |
| download | frameworks_native-8d31934148301b449d1b6277e25a6c3a8d162dff.zip frameworks_native-8d31934148301b449d1b6277e25a6c3a8d162dff.tar.gz frameworks_native-8d31934148301b449d1b6277e25a6c3a8d162dff.tar.bz2 | |
am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."
* commit '797498450cbcb87c28636e775ada942005436909':
Fix pointer-to-int and int-to-pointer warnings.
Diffstat (limited to 'opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp')
| -rw-r--r-- | opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp b/opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp index 41df486..d844152 100644 --- a/opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp +++ b/opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp @@ -32,7 +32,7 @@ android_glDrawElementsInstanced__IIIII (GLenum)mode, (GLsizei)count, (GLenum)type, - (GLvoid *)indicesOffset, + (GLvoid *)static_cast<uintptr_t>(indicesOffset), (GLsizei)instanceCount ); } |