egl: remove EGL_ANDROID_swap_rectangle

We never support this unofficial extension, and it has been removed from
Android recently.  There is no point in keeping it.

diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h
index 53576bacfee02f9df231ab267ab27acc51753ae1..52dd5b108fd5d92eeecd7c84d060a493805d1e91 100644 (file)
--- a/include/EGL/eglmesaext.h
+++ b/include/EGL/eglmesaext.h
@@ -143,14 +143,6 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EG
 #define EGL_NATIVE_BUFFER_ANDROID       0x3140  /* eglCreateImageKHR target */
 #endif
 
-#ifndef EGL_ANDROID_swap_rectangle
-#define EGL_ANDROID_swap_rectangle 1
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglSetSwapRectangleANDROID (EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height);
-#endif /* EGL_EGLEXT_PROTOTYPES */
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSWAPRECTANGLEANDROIDPROC) (EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 3cb1a5baaf381adafa2903d1443e2283bccf30d6..5d186c60e5a761617843601d50bad9d2f6558a19 100644 (file)
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -947,9 +947,6 @@ eglGetProcAddress(const char *procname)
 #ifdef EGL_WL_bind_wayland_display
       { "eglBindWaylandDisplayWL", (_EGLProc) eglBindWaylandDisplayWL },
       { "eglUnbindWaylandDisplayWL", (_EGLProc) eglUnbindWaylandDisplayWL },
-#endif
-#ifdef EGL_ANDROID_swap_rectangle
-      { "eglSetSwapRectangleANDROID", (_EGLProc) eglSetSwapRectangleANDROID },
 #endif
       { NULL, NULL }
    };
@@ -1568,25 +1565,3 @@ eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
    RETURN_EGL_EVAL(disp, ret);
 }
 #endif
-
-#ifdef EGL_ANDROID_swap_rectangle
-EGLBoolean EGLAPIENTRY
-eglSetSwapRectangleANDROID(EGLDisplay dpy, EGLSurface draw,
-                           EGLint left, EGLint top,
-                           EGLint width, EGLint height)
-{
-   _EGLDisplay *disp = _eglLockDisplay(dpy);
-   _EGLSurface *surf = _eglLookupSurface(draw, disp);
-   _EGLDriver *drv;
-   EGLBoolean ret;
-
-   _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
-
-   if (!disp->Extensions.ANDROID_swap_rectangle)
-      RETURN_EGL_EVAL(disp, EGL_FALSE);
-
-   ret = drv->API.SetSwapRectangleANDROID(drv, disp, surf, left, top, width, height);
-
-   RETURN_EGL_EVAL(disp, ret);
-}
-#endif

diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h
index 1e0aef69dd7004142f59b3ff05f518bcb6ce5336..4fcbe40cd4c8961f0d526fd1245ea45c7066cdd3 100644 (file)
--- a/src/egl/main/eglapi.h
+++ b/src/egl/main/eglapi.h
@@ -131,10 +131,6 @@ typedef EGLBoolean (*BindWaylandDisplayWL_t)(_EGLDriver *drv, _EGLDisplay *disp,
 typedef EGLBoolean (*UnbindWaylandDisplayWL_t)(_EGLDriver *drv, _EGLDisplay *disp, struct wl_display *display);
 #endif
 
-#ifdef EGL_ANDROID_swap_rectangle
-typedef EGLBoolean (*SetSwapRectangleANDROID_t)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, EGLint left, EGLint top, EGLint width, EGLint height);
-#endif
-
 /**
  * The API dispatcher jumps through these functions
  */
@@ -214,10 +210,6 @@ struct _egl_api
    BindWaylandDisplayWL_t BindWaylandDisplayWL;
    UnbindWaylandDisplayWL_t UnbindWaylandDisplayWL;
 #endif
-
-#ifdef EGL_ANDROID_swap_rectangle
-   SetSwapRectangleANDROID_t SetSwapRectangleANDROID;
-#endif
 };
 
 #endif /* EGLAPI_INCLUDED */

diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index 67a2e244e20513598ad3f13d82a90aaff3d2aa6e..17c76af7e264ec3077666de8e36988513929d525 100644 (file)
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -111,7 +111,6 @@ struct _egl_extensions
    EGLBoolean NOK_texture_from_pixmap;
 
    EGLBoolean ANDROID_image_native_buffer;
-   EGLBoolean ANDROID_swap_rectangle;
 };
 
 

diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c
index ab48bc68218255529830c8d243c3204e4c0a0f98..b478e79190143761cf79cb707f478e6fe638c9eb 100644 (file)
--- a/src/egl/main/eglmisc.c
+++ b/src/egl/main/eglmisc.c
@@ -115,7 +115,6 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy)
    _EGL_CHECK_EXTENSION(NOK_texture_from_pixmap);
 
    _EGL_CHECK_EXTENSION(ANDROID_image_native_buffer);
-   _EGL_CHECK_EXTENSION(ANDROID_swap_rectangle);
 #undef _EGL_CHECK_EXTENSION
 }