OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Make resource void pointer in _eglCheckResource.

Browse Source 
This emphasizes the fact that the resource to be checked could really be
invalid and have an unknown type.
This commit is contained in:
Chia-I Wu
2010-01-25 11:39:44 +08:00
parent 3f932a4440
commit dbb866ab33
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/egl/main/eglcontext.h
View File

@@ -95,9 +95,8 @@ _eglUnlinkContext(_EGLContext *ctx)
static INLINE _EGLContext *
_eglLookupContext(EGLContext context, _EGLDisplay *dpy)
{
_EGLResource *res = (_EGLResource *) context;
_EGLContext *ctx = (_EGLContext *) context;
if (!res || !dpy || !_eglCheckResource(res, _EGL_RESOURCE_CONTEXT, dpy))
if (!dpy || !_eglCheckResource((void *) ctx, _EGL_RESOURCE_CONTEXT, dpy))
ctx = NULL;
return ctx;
}

7
src/egl/main/egldisplay.c
View File

@@ -214,12 +214,15 @@ _eglCheckDisplayHandle(EGLDisplay dpy)
* own the resource.
*/
EGLBoolean
_eglCheckResource(_EGLResource *res, _EGLResourceType type, _EGLDisplay *dpy)
_eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy)
{
_EGLResource *list = dpy->ResourceLists[type];
if (!res)
return EGL_FALSE;
while (list) {
if (res == list) {
if (res == (void *) list) {
assert(list->Display == dpy);
break;
}

6
src/egl/main/egldisplay.h
View File

@@ -107,7 +107,7 @@ _eglCheckDisplayHandle(EGLDisplay dpy);
extern EGLBoolean
_eglCheckResource(_EGLResource *res, _EGLResourceType type, _EGLDisplay *dpy);
_eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy);
#else /* !_EGL_SKIP_HANDLE_CHECK */
@@ -122,9 +122,9 @@ _eglCheckDisplayHandle(EGLDisplay dpy)
static INLINE EGLBoolean
_eglCheckResource(_EGLResource *res, _EGLResourceType type, _EGLDisplay *dpy)
_eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy);
{
return (res->Display == dpy);
return (((_EGLResource *) res)->Display == dpy);
}

3
src/egl/main/eglimage.h
View File

@@ -61,9 +61,8 @@ _eglUnlinkImage(_EGLImage *img)
static INLINE _EGLImage *
_eglLookupImage(EGLImageKHR image, _EGLDisplay *dpy)
{
_EGLResource *res = (_EGLResource *) image;
_EGLImage *img = (_EGLImage *) image;
if (!res || !dpy || !_eglCheckResource(res, _EGL_RESOURCE_IMAGE, dpy))
if (!dpy || !_eglCheckResource((void *) img, _EGL_RESOURCE_IMAGE, dpy))
img = NULL;
return img;
}

3
src/egl/main/eglsurface.h
View File

@@ -141,9 +141,8 @@ _eglUnlinkSurface(_EGLSurface *surf)
static INLINE _EGLSurface *
_eglLookupSurface(EGLSurface surface, _EGLDisplay *dpy)
{
_EGLResource *res = (_EGLResource *) surface;
_EGLSurface *surf = (_EGLSurface *) surface;
if (!res || !dpy || !_eglCheckResource(res, _EGL_RESOURCE_SURFACE, dpy))
if (!dpy || !_eglCheckResource((void *) surf, _EGL_RESOURCE_SURFACE, dpy))
surf = NULL;
return surf;
}