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

Commit 0f64feb4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "remove unused private field"

parents 0164f5e1 287a1310

core/jni/com_google_android_gles_jni_EGLImpl.cpp

+0 −10
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ static jmethodID gConfig_ctorID; 
static jfieldID gDisplay_EGLDisplayFieldID;

static jfieldID gContext_EGLContextFieldID;

static jfieldID gSurface_EGLSurfaceFieldID;

static jfieldID gSurface_NativePixelRefFieldID;

static jfieldID gConfig_EGLConfigFieldID;



static inline EGLDisplay getDisplay(JNIEnv* env, jobject o) {
@@ -84,7 +83,6 @@ static void nativeClassInit(JNIEnv *_env, jclass eglImplClass) 


    jclass surface_class = _env->FindClass("com/google/android/gles_jni/EGLSurfaceImpl");

    gSurface_EGLSurfaceFieldID = _env->GetFieldID(surface_class, "mEGLSurface", "J");

    gSurface_NativePixelRefFieldID = _env->GetFieldID(surface_class, "mNativePixelRef", "J");

}



static const jint gNull_attrib_base[] = {EGL_NONE};
@@ -398,14 +396,6 @@ static jboolean jni_eglDestroySurface(JNIEnv *_env, jobject _this, jobject displ 
    }

    EGLDisplay dpy = getDisplay(_env, display);

    EGLSurface sur = getSurface(_env, surface);



    if (sur) {

        SkPixelRef* ref = (SkPixelRef*)(_env->GetLongField(surface,

                gSurface_NativePixelRefFieldID));

        if (ref) {

            SkSafeUnref(ref);

        }

    }

    return EglBoolToJBool(eglDestroySurface(dpy, sur));

}

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

+0 −3
Original line number Diff line number Diff line
@@ -20,14 +20,11 @@ import javax.microedition.khronos.egl.*; 


public class EGLSurfaceImpl extends EGLSurface {

    long mEGLSurface;

    private long mNativePixelRef;

    public EGLSurfaceImpl() {

        mEGLSurface = 0;

        mNativePixelRef = 0;

    }

    public EGLSurfaceImpl(long surface) {

        mEGLSurface = surface;

        mNativePixelRef = 0;

    }



    @Override