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

Commit 3e599252 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 

* commit '93e6a48b':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
parents 9d65631f 93e6a48b

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ static jobject 
android_eglGetDisplayInt

android_eglGetDisplayInt

  (JNIEnv *_env, jobject _this, jint display_id) {

  (JNIEnv *_env, jobject _this, jint display_id) {





    if (sizeof(void*) != sizeof(uint32_t)) {

    if ((EGLNativeDisplayType)display_id != EGL_DEFAULT_DISPLAY) {

        jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay");

        jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay");

        return 0;

        return 0;

    }

    }

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

+1 −2
Original line number Original line Diff line number Diff line 
    // C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id )

    // C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id )

    // TODO Deprecate the eglGetDisplay(int) API method





    public static native EGLDisplay eglGetDisplay(

    public static native EGLDisplay eglGetDisplay(

        int display_id

        int display_id

    );

    );

    // TODO Unhide the eglGetDisplay(long) API method



    /**

    /**

     * {@hide}

     * {@hide}

     */

     */