Mesa (master): egl: add missing error-checking to eglReleaseTexImage()
Tapani Pälli
tpalli at kemper.freedesktop.org
Wed Nov 16 06:38:08 UTC 2016
Module: Mesa
Branch: master
Commit: 25c60fa6a2d9861655271b5236c27aa72e48edbf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25c60fa6a2d9861655271b5236c27aa72e48edbf
Author: Eric Engestrom <eric at engestrom.ch>
Date: Sat Oct 1 00:23:26 2016 +0100
egl: add missing error-checking to eglReleaseTexImage()
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/egl/main/eglsurface.c | 43 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index 8e56919..04f42ca 100644
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -525,14 +525,51 @@ _eglBindTexImage(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surface,
}
EGLBoolean
-_eglReleaseTexImage(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
+_eglReleaseTexImage(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf,
EGLint buffer)
{
- /* TODO: do basic error checking and return success/fail.
+ /* Just do basic error checking and return success/fail.
* Drivers must implement the real stuff.
*/
- return EGL_TRUE;
+ EGLint texture_type = EGL_PBUFFER_BIT;
+
+ if (surf == EGL_NO_SURFACE)
+ {
+ _eglError(EGL_BAD_SURFACE, "eglReleaseTexImage");
+ return EGL_FALSE;
+ }
+
+ if (!surf->BoundToTexture)
+ {
+ /* Not an error, simply nothing to do */
+ return EGL_TRUE;
+ }
+
+ if (surf->TextureFormat == EGL_NO_TEXTURE)
+ {
+ _eglError(EGL_BAD_MATCH, "eglReleaseTexImage");
+ return EGL_FALSE;
+ }
+
+ if (buffer != EGL_BACK_BUFFER)
+ {
+ _eglError(EGL_BAD_PARAMETER, "eglReleaseTexImage");
+ return EGL_FALSE;
+ }
+
+ if (dpy->Extensions.NOK_texture_from_pixmap)
+ texture_type |= EGL_PIXMAP_BIT;
+
+ if (!(surf->Type & texture_type))
+ {
+ _eglError(EGL_BAD_SURFACE, "eglReleaseTexImage");
+ return EGL_FALSE;
+ }
+
+ surf->BoundToTexture = EGL_FALSE;
+
+ return EGL_TRUE;
}
More information about the mesa-commit
mailing list