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

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

Merge "Remove dependency on EGL private headers"

parents 1e24da7e 04d04618

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ LOCAL_C_INCLUDES += \ 
    $(JNI_H_INCLUDE) \

    $(LOCAL_PATH)/android/graphics \

    $(LOCAL_PATH)/../../libs/hwui \

    $(LOCAL_PATH)/../../../native/opengl/libs \

    $(LOCAL_PATH)/../../../native/vulkan/include \

    $(call include-path-for, bluedroid) \

    $(call include-path-for, libhardware)/hardware \

core/jni/android_view_ThreadedRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <EGL/egl_cache.h>

#include <private/EGL/cache.h>



#include <utils/Looper.h>

#include <utils/RefBase.h>
@@ -887,7 +887,7 @@ static void android_view_ThreadedRenderer_removeFrameMetricsObserver(JNIEnv* env 
static void android_view_ThreadedRenderer_setupShadersDiskCache(JNIEnv* env, jobject clazz,

        jstring diskCachePath) {

    const char* cacheArray = env->GetStringUTFChars(diskCachePath, NULL);

    egl_cache_t::get()->setCacheFilename(cacheArray);

    android::egl_set_cache_filename(cacheArray);

    env->ReleaseStringUTFChars(diskCachePath, cacheArray);

}

core/jni/com_google_android_gles_jni_EGLImpl.cpp

+2 −3
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include <utils/misc.h>





#include <EGL/egl_display.h>

#include <EGL/egl.h>

#include <GLES/gl.h>

#include <private/EGL/display.h>



#include <gui/Surface.h>

#include <gui/GLConsumer.h>
@@ -180,8 +180,7 @@ static jboolean jni_eglQuerySurface(JNIEnv *_env, jobject _this, jobject display 


static jint jni_getInitCount(JNIEnv *_env, jobject _clazz, jobject display) {

    EGLDisplay dpy = getDisplay(_env, display);

    egl_display_t* eglDisplay = get_display_nowake(dpy);

    return eglDisplay ? eglDisplay->getRefsCount() : 0;

    return android::egl_get_init_count(dpy);

}



static jboolean jni_eglReleaseThread(JNIEnv *_env, jobject _this) {