drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b78cce6f: Merge "Update autogenerated gl functions."

Browse Source 
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.
This commit is contained in:
Dan Albert
2015-02-25 23:00:52 +00:00
committed by Android Git Automerger
parent 533758c1fb b78cce6f92
commit b7121d7030
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.mk
View File

@ -5,7 +5,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
LOCAL_CFLAGS += -U__APPLE__ LOCAL_CFLAGS += -U__APPLE__
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_CFLAGS += -Wno-non-virtual-dtor LOCAL_CFLAGS += -Wno-non-virtual-dtor
LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
LOCAL_CPPFLAGS += -Wno-conversion-null LOCAL_CPPFLAGS += -Wno-conversion-null

3
core/jni/android_opengl_EGL14.cpp
View File

@ -160,7 +160,8 @@ static jobject
android_eglGetDisplayInt android_eglGetDisplayInt
(JNIEnv *_env, jobject _this, jint display_id) { (JNIEnv *_env, jobject _this, jint display_id) {
if ((EGLNativeDisplayType)display_id != EGL_DEFAULT_DISPLAY) { if (static_cast<uintptr_t>(display_id) !=
reinterpret_cast<uintptr_t>(EGL_DEFAULT_DISPLAY)) {
jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay"); jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay");
return 0; return 0;
} }

8
core/jni/android_opengl_GLES30.cpp
View File

@ -1935,7 +1935,11 @@ android_glGetTransformFeedbackVarying__IIILjava_nio_IntBuffer_2Ljava_nio_IntBuff
(GLsizei *)length, (GLsizei *)length,
(GLint *)size, (GLint *)size,
(GLenum *)type, (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) { if (_typeArray) {
releasePointer(_env, _typeArray, type, JNI_TRUE); releasePointer(_env, _typeArray, type, JNI_TRUE);
@ -3643,7 +3647,7 @@ android_glDrawElementsInstanced__IIIII
(GLenum)mode, (GLenum)mode,
(GLsizei)count, (GLsizei)count,
(GLenum)type, (GLenum)type,
(GLvoid *)indicesOffset, (GLvoid *)static_cast<uintptr_t>(indicesOffset),
(GLsizei)instanceCount (GLsizei)instanceCount
); );
} }