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.
This commit is contained in:
@@ -143,14 +143,6 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EG
|
|||||||
#define EGL_NATIVE_BUFFER_ANDROID 0x3140 /* eglCreateImageKHR target */
|
#define EGL_NATIVE_BUFFER_ANDROID 0x3140 /* eglCreateImageKHR target */
|
||||||
#endif
|
#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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -947,9 +947,6 @@ eglGetProcAddress(const char *procname)
|
|||||||
#ifdef EGL_WL_bind_wayland_display
|
#ifdef EGL_WL_bind_wayland_display
|
||||||
{ "eglBindWaylandDisplayWL", (_EGLProc) eglBindWaylandDisplayWL },
|
{ "eglBindWaylandDisplayWL", (_EGLProc) eglBindWaylandDisplayWL },
|
||||||
{ "eglUnbindWaylandDisplayWL", (_EGLProc) eglUnbindWaylandDisplayWL },
|
{ "eglUnbindWaylandDisplayWL", (_EGLProc) eglUnbindWaylandDisplayWL },
|
||||||
#endif
|
|
||||||
#ifdef EGL_ANDROID_swap_rectangle
|
|
||||||
{ "eglSetSwapRectangleANDROID", (_EGLProc) eglSetSwapRectangleANDROID },
|
|
||||||
#endif
|
#endif
|
||||||
{ NULL, NULL }
|
{ NULL, NULL }
|
||||||
};
|
};
|
||||||
@@ -1568,25 +1565,3 @@ eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
|
|||||||
RETURN_EGL_EVAL(disp, ret);
|
RETURN_EGL_EVAL(disp, ret);
|
||||||
}
|
}
|
||||||
#endif
|
#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
|
|
||||||
|
@@ -131,10 +131,6 @@ typedef EGLBoolean (*BindWaylandDisplayWL_t)(_EGLDriver *drv, _EGLDisplay *disp,
|
|||||||
typedef EGLBoolean (*UnbindWaylandDisplayWL_t)(_EGLDriver *drv, _EGLDisplay *disp, struct wl_display *display);
|
typedef EGLBoolean (*UnbindWaylandDisplayWL_t)(_EGLDriver *drv, _EGLDisplay *disp, struct wl_display *display);
|
||||||
#endif
|
#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
|
* The API dispatcher jumps through these functions
|
||||||
*/
|
*/
|
||||||
@@ -214,10 +210,6 @@ struct _egl_api
|
|||||||
BindWaylandDisplayWL_t BindWaylandDisplayWL;
|
BindWaylandDisplayWL_t BindWaylandDisplayWL;
|
||||||
UnbindWaylandDisplayWL_t UnbindWaylandDisplayWL;
|
UnbindWaylandDisplayWL_t UnbindWaylandDisplayWL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef EGL_ANDROID_swap_rectangle
|
|
||||||
SetSwapRectangleANDROID_t SetSwapRectangleANDROID;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* EGLAPI_INCLUDED */
|
#endif /* EGLAPI_INCLUDED */
|
||||||
|
@@ -111,7 +111,6 @@ struct _egl_extensions
|
|||||||
EGLBoolean NOK_texture_from_pixmap;
|
EGLBoolean NOK_texture_from_pixmap;
|
||||||
|
|
||||||
EGLBoolean ANDROID_image_native_buffer;
|
EGLBoolean ANDROID_image_native_buffer;
|
||||||
EGLBoolean ANDROID_swap_rectangle;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -115,7 +115,6 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy)
|
|||||||
_EGL_CHECK_EXTENSION(NOK_texture_from_pixmap);
|
_EGL_CHECK_EXTENSION(NOK_texture_from_pixmap);
|
||||||
|
|
||||||
_EGL_CHECK_EXTENSION(ANDROID_image_native_buffer);
|
_EGL_CHECK_EXTENSION(ANDROID_image_native_buffer);
|
||||||
_EGL_CHECK_EXTENSION(ANDROID_swap_rectangle);
|
|
||||||
#undef _EGL_CHECK_EXTENSION
|
#undef _EGL_CHECK_EXTENSION
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user