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

egl: Make lookup functions static inline.

Browse Source 
progs/egl/demo3.c is also changed since it uses an internal function.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
This commit is contained in:
Chia-I Wu
2009-08-14 18:05:19 +08:00
committed by Brian Paul
parent 38feefdc4e
commit e3734e4685
3 changed files with 80 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
progs/egl/demo3.c
View File

@@ -551,7 +551,7 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height)
}
}
#include "../src/egl/main/egldisplay.h"
#include "../../src/egl/main/egldisplay.h"
typedef struct fb_display
{

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

@@ -113,28 +113,6 @@ _eglUnlinkDisplay(_EGLDisplay *dpy)
}
/**
* Return the handle of a linked display, or EGL_NO_DISPLAY.
*/
EGLDisplay
_eglGetDisplayHandle(_EGLDisplay *dpy)
{
return (EGLDisplay) ((dpy) ? dpy : EGL_NO_DISPLAY);
}
/**
* Lookup a handle to find the linked display.
* Return NULL if the handle has no corresponding linked display.
*/
_EGLDisplay *
_eglLookupDisplay(EGLDisplay display)
{
_EGLDisplay *dpy = (_EGLDisplay *) display;
return dpy;
}
/**
* Find the display corresponding to the specified native display id in all
* linked displays.
@@ -256,28 +234,6 @@ _eglUnlinkContext(_EGLContext *ctx)
}
/**
* Return the handle of a linked context, or EGL_NO_CONTEXT.
*/
EGLContext
_eglGetContextHandle(_EGLContext *ctx)
{
return (EGLContext) ((ctx && ctx->Display) ? ctx : EGL_NO_CONTEXT);
}
/**
* Lookup a handle to find the linked context.
* Return NULL if the handle has no corresponding linked context.
*/
_EGLContext *
_eglLookupContext(EGLContext ctx, _EGLDisplay *dpy)
{
_EGLContext *context = (_EGLContext *) ctx;
return (context && context->Display) ? context : NULL;
}
/**
* Link a surface to a display and return the handle of the link.
* The handle can be passed to client directly.
@@ -319,25 +275,3 @@ _eglUnlinkSurface(_EGLSurface *surf)
surf->Next = NULL;
surf->Display = NULL;
}
/**
* Return the handle of a linked surface, or EGL_NO_SURFACE.
*/
EGLSurface
_eglGetSurfaceHandle(_EGLSurface *surf)
{
return (EGLSurface) ((surf && surf->Display) ? surf : EGL_NO_SURFACE);
}
/**
* Lookup a handle to find the linked surface.
* Return NULL if the handle has no corresponding linked surface.
*/
_EGLSurface *
_eglLookupSurface(EGLSurface surface, _EGLDisplay *dpy)
{
_EGLSurface *surf = (_EGLSurface *) surface;
return (surf && surf->Display) ? surf : NULL;
}

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

@@ -6,8 +6,9 @@
#endif
#include "egltypedefs.h"
#include "eglhash.h"
#include "egldefines.h"
#include "eglcontext.h"
#include "eglsurface.h"
/**
@@ -76,24 +77,6 @@ extern void
_eglUnlinkDisplay(_EGLDisplay *dpy);
extern EGLDisplay
_eglGetDisplayHandle(_EGLDisplay *display);
extern _EGLDisplay *
_eglLookupDisplay(EGLDisplay dpy);
/**
* Return true if the display is linked.
*/
static INLINE EGLBoolean
_eglIsDisplayLinked(_EGLDisplay *dpy)
{
return (EGLBoolean) (_eglGetDisplayHandle(dpy) != EGL_NO_DISPLAY);
}
extern _EGLDisplay *
_eglFindDisplay(NativeDisplayType nativeDisplay);
@@ -114,12 +97,66 @@ extern void
_eglUnlinkContext(_EGLContext *ctx);
extern EGLContext
_eglGetContextHandle(_EGLContext *ctx);
extern EGLSurface
_eglLinkSurface(_EGLSurface *surf, _EGLDisplay *dpy);
extern _EGLContext *
_eglLookupContext(EGLContext ctx, _EGLDisplay *dpy);
extern void
_eglUnlinkSurface(_EGLSurface *surf);
/**
* Lookup a handle to find the linked display.
* Return NULL if the handle has no corresponding linked display.
*/
static INLINE _EGLDisplay *
_eglLookupDisplay(EGLDisplay display)
{
_EGLDisplay *dpy = (_EGLDisplay *) display;
return dpy;
}
/**
* Return the handle of a linked display, or EGL_NO_DISPLAY.
*/
static INLINE EGLDisplay
_eglGetDisplayHandle(_EGLDisplay *dpy)
{
return (EGLDisplay) ((dpy) ? dpy : EGL_NO_DISPLAY);
}
/**
* Return true if the display is linked.
*/
static INLINE EGLBoolean
_eglIsDisplayLinked(_EGLDisplay *dpy)
{
return (EGLBoolean) (_eglGetDisplayHandle(dpy) != EGL_NO_DISPLAY);
}
/**
* Lookup a handle to find the linked context.
* Return NULL if the handle has no corresponding linked context.
*/
static INLINE _EGLContext *
_eglLookupContext(EGLContext context, _EGLDisplay *dpy)
{
_EGLContext *ctx = (_EGLContext *) context;
return (ctx && ctx->Display) ? ctx : NULL;
}
/**
* Return the handle of a linked context, or EGL_NO_CONTEXT.
*/
static INLINE EGLContext
_eglGetContextHandle(_EGLContext *ctx)
{
return (EGLContext) ((ctx && ctx->Display) ? ctx : EGL_NO_CONTEXT);
}
/**
@@ -131,20 +168,27 @@ _eglIsContextLinked(_EGLContext *ctx)
return (EGLBoolean) (_eglGetContextHandle(ctx) != EGL_NO_CONTEXT);
}
extern EGLSurface
_eglLinkSurface(_EGLSurface *surf, _EGLDisplay *dpy);
/**
* Lookup a handle to find the linked surface.
* Return NULL if the handle has no corresponding linked surface.
*/
static INLINE _EGLSurface *
_eglLookupSurface(EGLSurface surface, _EGLDisplay *dpy)
{
_EGLSurface *surf = (_EGLSurface *) surface;
return (surf && surf->Display) ? surf : NULL;
}
extern void
_eglUnlinkSurface(_EGLSurface *surf);
extern EGLSurface
_eglGetSurfaceHandle(_EGLSurface *);
extern _EGLSurface *
_eglLookupSurface(EGLSurface surf, _EGLDisplay *dpy);
/**
* Return the handle of a linked surface, or EGL_NO_SURFACE.
*/
static INLINE EGLSurface
_eglGetSurfaceHandle(_EGLSurface *surf)
{
return (EGLSurface) ((surf && surf->Display) ? surf : EGL_NO_SURFACE);
}
/**