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

Commit 25b81110 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1

parents ad542efb 9b7146db

core/jni/com_google_android_gles_jni_EGLImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static jint jni_eglGetCurrentDisplay(JNIEnv *_env, jobject _this) { 
}



static jint jni_eglGetCurrentSurface(JNIEnv *_env, jobject _this, jint readdraw) {

    if (!(readdraw == EGL_READ) || (readdraw == EGL_DRAW)) {

    if ((readdraw != EGL_READ) && (readdraw != EGL_DRAW)) {

        doThrow(_env, "java/lang/IllegalArgumentException");

        return 0;

    }

opengl/java/com/google/android/gles_jni/EGLContextImpl.java

+15 −0
Original line number Diff line number Diff line
@@ -32,4 +32,19 @@ public class EGLContextImpl extends EGLContext { 
    public GL getGL() {

        return mGLContext;

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;



        EGLContextImpl that = (EGLContextImpl) o;



        return mEGLContext == that.mEGLContext;

    }



    @Override

    public int hashCode() {

        return mEGLContext;

    }

}

opengl/java/com/google/android/gles_jni/EGLDisplayImpl.java

+16 −0
Original line number Diff line number Diff line
@@ -24,4 +24,20 @@ public class EGLDisplayImpl extends EGLDisplay { 
    public EGLDisplayImpl(int dpy) {

        mEGLDisplay = dpy;

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;



        EGLDisplayImpl that = (EGLDisplayImpl) o;



        return mEGLDisplay == that.mEGLDisplay;



    }



    @Override

    public int hashCode() {

        return mEGLDisplay;

    }

}

opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java

+16 −0
Original line number Diff line number Diff line
@@ -29,4 +29,20 @@ public class EGLSurfaceImpl extends EGLSurface { 
        mEGLSurface = surface;

        mNativePixelRef = 0;

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;



        EGLSurfaceImpl that = (EGLSurfaceImpl) o;



        return mEGLSurface == that.mEGLSurface;



    }



    @Override

    public int hashCode() {

        return mEGLSurface;

    }

}