commit 34a2f134f2bfcfd4e4c38439bdcc3180f1bc1ff1
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Oct 20 02:04:44 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 20 02:04:44 2018 +0000
tree d753869e51ff1525c6983a1352f93684a87f116f
parent 123e17714ed0d3daa8a35afb6f246b680fecc4b5
parent eb606b265b8efc5295216e6c1d204113c100eb05

Merge "Remove eglSignalSync"

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index bff08d0..29a966d 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -437,13 +437,6 @@
     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

diff --git a/opengl/libs/EGL/egl_entries.in b/opengl/libs/EGL/egl_entries.in
index 10c305e..2921d51 100644
--- a/opengl/libs/EGL/egl_entries.in
+++ b/opengl/libs/EGL/egl_entries.in
@@ -53,7 +53,6 @@
 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

diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
index 94c7fdd..1daa4d2 100644
--- a/opengl/libs/EGL/egl_platform_entries.cpp
+++ b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -1861,36 +1861,18 @@
     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 @@
     { "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

diff --git a/opengl/libs/platform_entries.in b/opengl/libs/platform_entries.in
index 08f574e..4673411 100644
--- a/opengl/libs/platform_entries.in
+++ b/opengl/libs/platform_entries.in
@@ -46,7 +46,6 @@
 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*)