diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-23 10:41:10 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-02-23 10:47:19 -0800 |
| commit | 10caf0390d39f0bd46876eee6ab2c9a73d4e1d39 (patch) | |
| tree | d961d1da039937596719bec9bbe98a56ac54b851 /core/jni/android_opengl_GLES30.cpp | |
| parent | adb52ef7034d4d3e0eee58cedae2a343d29771b9 (diff) | |
| download | frameworks_base-10caf0390d39f0bd46876eee6ab2c9a73d4e1d39.zip frameworks_base-10caf0390d39f0bd46876eee6ab2c9a73d4e1d39.tar.gz frameworks_base-10caf0390d39f0bd46876eee6ab2c9a73d4e1d39.tar.bz2 | |
Update autogenerated gl functions.
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/
Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.
Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
Diffstat (limited to 'core/jni/android_opengl_GLES30.cpp')
| -rw-r--r-- | core/jni/android_opengl_GLES30.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index 713fff9..226162d 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -1935,7 +1935,11 @@ android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuff (GLsizei *)length, (GLint *)size, (GLenum *)type, - (char *)name + // The cast below is incorrect. The driver will end up writing to the + // address specified by name, which will always crash the process since + // it is guaranteed to be in low memory. The additional static_cast + // suppresses the warning for now. http://b/19478262 + (char *)static_cast<uintptr_t>(name) ); if (_typeArray) { releasePointer(_env, _typeArray, type, JNI_TRUE); @@ -3643,7 +3647,7 @@ android_glDrawElementsInstanced__IIIII (GLenum)mode, (GLsizei)count, (GLenum)type, - (GLvoid *)indicesOffset, + (GLvoid *)static_cast<uintptr_t>(indicesOffset), (GLsizei)instanceCount ); } |