summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2011-12-20 16:19:08 +0800
committerChia-I Wu <olv@lunarg.com>2011-12-20 16:20:17 +0800
commited1ff2acec2cdfe3eace9f4caa6cfe5e0f175534 (patch)
treea5543b1fd02fd3438ceaf5659e4bee21a9754aff
parentb7acfe7755a316910f883aeb05d834e1f3f7bd93 (diff)
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.
-rw-r--r--include/EGL/eglmesaext.h8
-rw-r--r--src/egl/main/eglapi.c25
-rw-r--r--src/egl/main/eglapi.h8
-rw-r--r--src/egl/main/egldisplay.h1
-rw-r--r--src/egl/main/eglmisc.c1
5 files changed, 0 insertions, 43 deletions
diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h
index 53576bacfee..52dd5b108fd 100644
--- 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 3cb1a5baaf3..5d186c60e5a 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -948,9 +948,6 @@ eglGetProcAddress(const char *procname)
{ "eglBindWaylandDisplayWL", (_EGLProc) eglBindWaylandDisplayWL },
{ "eglUnbindWaylandDisplayWL", (_EGLProc) eglUnbindWaylandDisplayWL },
#endif
-#ifdef EGL_ANDROID_swap_rectangle
- { "eglSetSwapRectangleANDROID", (_EGLProc) eglSetSwapRectangleANDROID },
-#endif
{ NULL, NULL }
};
EGLint i;
@@ -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 1e0aef69dd7..4fcbe40cd4c 100644
--- 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 67a2e244e20..17c76af7e26 100644
--- 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 ab48bc68218..b478e791901 100644
--- 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
}