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

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

Merge "Remove eglSignalSync"

parents 123e1771 eb606b26

opengl/libs/EGL/eglApi.cpp

+0 −7
Original line number Diff line number Diff line
@@ -437,13 +437,6 @@ EGLBoolean eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync) { 
    return cnx->platform.eglDestroySyncKHR(dpy, sync);

}



EGLBoolean eglSignalSync(EGLDisplay dpy, EGLSync sync, EGLenum mode) {

    clearError();



    egl_connection_t* const cnx = &gEGLImpl;

    return cnx->platform.eglSignalSync(dpy, sync, mode);

}



EGLBoolean eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) {

    clearError();

opengl/libs/EGL/egl_entries.in

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ EGL_ENTRY(EGLSurface, eglCreatePlatformPixmapSurface, EGLDisplay, EGLConfig, voi 
EGL_ENTRY(EGLSyncKHR, eglCreateSync, EGLDisplay, EGLenum, const EGLAttrib *)

EGL_ENTRY(EGLBoolean, eglDestroySync, EGLDisplay, EGLSync)

EGL_ENTRY(EGLint, eglClientWaitSync, EGLDisplay, EGLSync, EGLint, EGLTimeKHR)

EGL_ENTRY(EGLBoolean, eglSignalSync, EGLDisplay, EGLSync, EGLenum)

EGL_ENTRY(EGLBoolean, eglGetSyncAttrib, EGLDisplay, EGLSync, EGLint, EGLAttrib *)

EGL_ENTRY(EGLBoolean, eglWaitSync, EGLDisplay, EGLSync, EGLint)

opengl/libs/EGL/egl_platform_entries.cpp

+3 −22
Original line number Diff line number Diff line
@@ -1861,36 +1861,18 @@ EGLBoolean eglDestroySyncImpl(EGLDisplay dpy, EGLSyncKHR sync) { 
    return eglDestroySyncTmpl(dpy, sync, cnx->egl.eglDestroySyncKHR);

}



EGLBoolean eglSignalSyncTmpl(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode,

                             PFNEGLSIGNALSYNCKHRPROC eglSignalSyncFunc) {

EGLBoolean eglSignalSyncKHRImpl(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) {

    const egl_display_ptr dp = validate_display(dpy);

    if (!dp) return EGL_FALSE;



    EGLBoolean result = EGL_FALSE;

    egl_connection_t* const cnx = &gEGLImpl;

    if (cnx->dso && eglSignalSyncFunc) {

        result = eglSignalSyncFunc(dp->disp.dpy, sync, mode);

    if (cnx->dso && gEGLImpl.egl.eglSignalSyncKHR) {

        result = gEGLImpl.egl.eglSignalSyncKHR(dp->disp.dpy, sync, mode);

    }

    return result;

}



EGLBoolean eglSignalSyncKHRImpl(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) {

    return eglSignalSyncTmpl(dpy, sync, mode, gEGLImpl.egl.eglSignalSyncKHR);

}



EGLBoolean eglSignalSyncImpl(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) {

    egl_connection_t* const cnx = &gEGLImpl;

    if (cnx->driverVersion >= EGL_MAKE_VERSION(1, 5, 0)) {

        if (cnx->egl.eglSignalSync) {

            return eglSignalSyncTmpl(dpy, sync, mode, cnx->egl.eglSignalSync);

        }

        ALOGE("Driver indicates EGL 1.5 support, but does not have eglSignalSync");

        return setError(EGL_BAD_DISPLAY, EGL_FALSE);

    }



    return eglSignalSyncTmpl(dpy, sync, mode, gEGLImpl.egl.eglSignalSyncKHR);

}



EGLint eglClientWaitSyncTmpl(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout,

                             PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncFunc) {

    const egl_display_ptr dp = validate_display(dpy);
@@ -2668,7 +2650,6 @@ static const implementation_map_t sPlatformImplMap[] = { 
    { "eglDestroyImage", (EGLFuncPointer)&eglDestroyImageImpl },

    { "eglCreateSync", (EGLFuncPointer)&eglCreateSyncImpl },

    { "eglDestroySync", (EGLFuncPointer)&eglDestroySyncImpl },

    { "eglSignalSync", (EGLFuncPointer)&eglSignalSyncImpl },

    { "eglClientWaitSync", (EGLFuncPointer)&eglClientWaitSyncImpl },

    { "eglGetSyncAttrib", (EGLFuncPointer)&eglGetSyncAttribImpl },

    { "eglCreateSyncKHR", (EGLFuncPointer)&eglCreateSyncKHRImpl },

opengl/libs/platform_entries.in

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ EGL_ENTRY(EGLImageKHR, eglCreateImageKHR, EGLDisplay, EGLContext, EGLenum, EGLCl 
EGL_ENTRY(EGLBoolean, eglDestroyImageKHR, EGLDisplay, EGLImageKHR)

EGL_ENTRY(EGLSync, eglCreateSync, EGLDisplay, EGLenum, const EGLAttrib*)

EGL_ENTRY(EGLBoolean, eglDestroySync, EGLDisplay, EGLSync)

EGL_ENTRY(EGLBoolean, eglSignalSync, EGLDisplay, EGLSync, EGLenum)

EGL_ENTRY(EGLint, eglClientWaitSync, EGLDisplay, EGLSync, EGLint, EGLTimeKHR)

EGL_ENTRY(EGLBoolean, eglGetSyncAttrib, EGLDisplay, EGLSyncKHR, EGLint, EGLAttrib*)

EGL_ENTRY(EGLSyncKHR, eglCreateSyncKHR, EGLDisplay, EGLenum, const EGLint*)