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

Commit 8d319341 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings." 

* commit '79749845':
  Fix pointer-to-int and int-to-pointer warnings.
parents a455ec21 79749845

opengl/tools/glgen/stubs/egl/eglGetDisplay.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,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;

    }

    }

opengl/tools/glgen/stubs/gles11/glDrawElementsInstanced.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,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

    );

    );

}

}

opengl/tools/glgen/stubs/gles11/glGetTransformFeedbackVarying.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,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);