Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b78cce6f authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Update autogenerated gl functions."

parents 0d8b97a4 10caf039

core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 
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 += -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-maybe-uninitialized -Wno-parentheses

LOCAL_CPPFLAGS += -Wno-conversion-null

core/jni/android_opengl_EGL14.cpp

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ static jobject 
android_eglGetDisplayInt

  (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");

        return 0;

    }

core/jni/android_opengl_GLES30.cpp

+6 −2
Original line number Diff line number Diff line
@@ -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

    );

}