* A bunch of macros and checks to simplify error checking.
*/
-#define _EGL_CHECK_DISPLAY(disp, ret, drv) \
+#define _EGL_CHECK_DISPLAY(disp, ret) \
do { \
- drv = _eglCheckDisplay(disp, __func__); \
- if (!drv) \
+ if (!_eglCheckDisplay(disp, __func__)) \
RETURN_EGL_ERROR(disp, 0, ret); \
} while (0)
-#define _EGL_CHECK_OBJECT(disp, type, obj, ret, drv) \
+#define _EGL_CHECK_OBJECT(disp, type, obj, ret) \
do { \
- drv = _eglCheck ## type(disp, obj, __func__); \
- if (!drv) \
+ if (!_eglCheck ## type(disp, obj, __func__)) \
RETURN_EGL_ERROR(disp, 0, ret); \
} while (0)
-#define _EGL_CHECK_SURFACE(disp, surf, ret, drv) \
- _EGL_CHECK_OBJECT(disp, Surface, surf, ret, drv)
+#define _EGL_CHECK_SURFACE(disp, surf, ret) \
+ _EGL_CHECK_OBJECT(disp, Surface, surf, ret)
-#define _EGL_CHECK_CONTEXT(disp, context, ret, drv) \
- _EGL_CHECK_OBJECT(disp, Context, context, ret, drv)
+#define _EGL_CHECK_CONTEXT(disp, context, ret) \
+ _EGL_CHECK_OBJECT(disp, Context, context, ret)
-#define _EGL_CHECK_CONFIG(disp, conf, ret, drv) \
- _EGL_CHECK_OBJECT(disp, Config, conf, ret, drv)
+#define _EGL_CHECK_CONFIG(disp, conf, ret) \
+ _EGL_CHECK_OBJECT(disp, Config, conf, ret)
-#define _EGL_CHECK_SYNC(disp, s, ret, drv) \
- _EGL_CHECK_OBJECT(disp, Sync, s, ret, drv)
+#define _EGL_CHECK_SYNC(disp, s, ret) \
+ _EGL_CHECK_OBJECT(disp, Sync, s, ret)
struct _egl_entrypoint {
};
-static inline const _EGLDriver *
+static inline bool
_eglCheckDisplay(_EGLDisplay *disp, const char *msg)
{
if (!disp) {
_eglError(EGL_BAD_DISPLAY, msg);
- return NULL;
+ return false;
}
if (!disp->Initialized) {
_eglError(EGL_NOT_INITIALIZED, msg);
- return NULL;
+ return false;
}
- return disp->Driver;
+ return true;
}
-static inline const _EGLDriver *
+static inline bool
_eglCheckSurface(_EGLDisplay *disp, _EGLSurface *surf, const char *msg)
{
- const _EGLDriver *drv = _eglCheckDisplay(disp, msg);
- if (!drv)
- return NULL;
+ if (!_eglCheckDisplay(disp, msg))
+ return false;
if (!surf) {
_eglError(EGL_BAD_SURFACE, msg);
- return NULL;
+ return false;
}
- return drv;
+ return true;
}
-static inline const _EGLDriver *
+static inline bool
_eglCheckContext(_EGLDisplay *disp, _EGLContext *context, const char *msg)
{
- const _EGLDriver *drv = _eglCheckDisplay(disp, msg);
- if (!drv)
- return NULL;
+ if (!_eglCheckDisplay(disp, msg))
+ return false;
if (!context) {
_eglError(EGL_BAD_CONTEXT, msg);
- return NULL;
+ return false;
}
- return drv;
+ return true;
}
-static inline const _EGLDriver *
+static inline bool
_eglCheckConfig(_EGLDisplay *disp, _EGLConfig *conf, const char *msg)
{
- const _EGLDriver *drv = _eglCheckDisplay(disp, msg);
- if (!drv)
- return NULL;
+ if (!_eglCheckDisplay(disp, msg))
+ return false;
if (!conf) {
_eglError(EGL_BAD_CONFIG, msg);
- return NULL;
+ return false;
}
- return drv;
+ return true;
}
-static inline const _EGLDriver *
+static inline bool
_eglCheckSync(_EGLDisplay *disp, _EGLSync *s, const char *msg)
{
- const _EGLDriver *drv = _eglCheckDisplay(disp, msg);
- if (!drv)
- return NULL;
+ if (!_eglCheckDisplay(disp, msg))
+ return false;
if (!s) {
_eglError(EGL_BAD_PARAMETER, msg);
- return NULL;
+ return false;
}
- return drv;
+ return true;
}
eglQueryString(EGLDisplay dpy, EGLint name)
{
_EGLDisplay *disp;
- const _EGLDriver *drv;
#if !USE_LIBGLVND
if (dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS) {
disp = _eglLockDisplay(dpy);
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, NULL);
- _EGL_CHECK_DISPLAY(disp, NULL, drv);
+ _EGL_CHECK_DISPLAY(disp, NULL);
switch (name) {
case EGL_VENDOR:
EGLint config_size, EGLint *num_config)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
if (!num_config)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = _eglGetConfigs(drv, disp, configs, config_size, num_config);
+ ret = _eglGetConfigs(disp, configs, config_size, num_config);
RETURN_EGL_EVAL(disp, ret);
}
EGLint config_size, EGLint *num_config)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
if (!num_config)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = _eglChooseConfig(drv, disp, attrib_list, configs,
+ ret = _eglChooseConfig(disp, attrib_list, configs,
config_size, num_config);
RETURN_EGL_EVAL(disp, ret);
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLConfig *conf = _eglLookupConfig(config, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_CONFIG(disp, conf, EGL_FALSE, drv);
+ _EGL_CHECK_CONFIG(disp, conf, EGL_FALSE);
- ret = _eglGetConfigAttrib(drv, disp, conf, attribute, value);
+ ret = _eglGetConfigAttrib(disp, conf, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLConfig *conf = _eglLookupConfig(config, disp);
_EGLContext *share = _eglLookupContext(share_list, disp);
- const _EGLDriver *drv;
_EGLContext *context;
EGLContext ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_NO_CONTEXT);
- _EGL_CHECK_DISPLAY(disp, EGL_NO_CONTEXT, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_NO_CONTEXT);
if (config != EGL_NO_CONFIG_KHR)
- _EGL_CHECK_CONFIG(disp, conf, EGL_NO_CONTEXT, drv);
+ _EGL_CHECK_CONFIG(disp, conf, EGL_NO_CONTEXT);
else if (!disp->Extensions.KHR_no_config_context)
RETURN_EGL_ERROR(disp, EGL_BAD_CONFIG, EGL_NO_CONTEXT);
if (!share && share_list != EGL_NO_CONTEXT)
RETURN_EGL_ERROR(disp, EGL_BAD_CONTEXT, EGL_NO_CONTEXT);
- context = drv->CreateContext(disp, conf, share, attrib_list);
+ context = disp->Driver->CreateContext(disp, conf, share, attrib_list);
ret = (context) ? _eglLinkContext(context) : EGL_NO_CONTEXT;
RETURN_EGL_EVAL(disp, ret);
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLContext *context = _eglLookupContext(ctx, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE);
- _EGL_CHECK_CONTEXT(disp, context, EGL_FALSE, drv);
+ _EGL_CHECK_CONTEXT(disp, context, EGL_FALSE);
_eglUnlinkContext(context);
- ret = drv->DestroyContext(disp, context);
+ ret = disp->Driver->DestroyContext(disp, context);
RETURN_EGL_EVAL(disp, ret);
}
_EGLContext *context = _eglLookupContext(ctx, disp);
_EGLSurface *draw_surf = _eglLookupSurface(draw, disp);
_EGLSurface *read_surf = _eglLookupSurface(read, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE);
if (!disp)
RETURN_EGL_ERROR(disp, EGL_BAD_DISPLAY, EGL_FALSE);
- drv = disp->Driver;
/* display is allowed to be uninitialized under certain condition */
if (!disp->Initialized) {
ctx != EGL_NO_CONTEXT)
RETURN_EGL_ERROR(disp, EGL_BAD_DISPLAY, EGL_FALSE);
}
- if (!drv)
+ if (!disp->Driver)
RETURN_EGL_SUCCESS(disp, EGL_TRUE);
if (!context && ctx != EGL_NO_CONTEXT)
if (read_surf && read_surf->Lost)
RETURN_EGL_ERROR(disp, EGL_BAD_NATIVE_WINDOW, EGL_FALSE);
- ret = drv->MakeCurrent(disp, draw_surf, read_surf, context);
+ ret = disp->Driver->MakeCurrent(disp, draw_surf, read_surf, context);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLContext *context = _eglLookupContext(ctx, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_CONTEXT_KHR, context, EGL_FALSE);
- _EGL_CHECK_CONTEXT(disp, context, EGL_FALSE, drv);
+ _EGL_CHECK_CONTEXT(disp, context, EGL_FALSE);
- ret = _eglQueryContext(drv, disp, context, attribute, value);
+ ret = _eglQueryContext(context, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
void *native_window, const EGLint *attrib_list)
{
_EGLConfig *conf = _eglLookupConfig(config, disp);
- const _EGLDriver *drv;
_EGLSurface *surf;
EGLSurface ret;
RETURN_EGL_ERROR(disp, EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);
}
- _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
+ _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE);
if ((conf->SurfaceType & EGL_WINDOW_BIT) == 0)
RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE);
if (_eglNativeSurfaceAlreadyUsed(disp, native_window))
RETURN_EGL_ERROR(disp, EGL_BAD_ALLOC, EGL_NO_SURFACE);
- surf = drv->CreateWindowSurface(disp, conf, native_window, attrib_list);
+ surf = disp->Driver->CreateWindowSurface(disp, conf, native_window, attrib_list);
ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
RETURN_EGL_EVAL(disp, ret);
void *native_pixmap, const EGLint *attrib_list)
{
_EGLConfig *conf = _eglLookupConfig(config, disp);
- const _EGLDriver *drv;
_EGLSurface *surf;
EGLSurface ret;
RETURN_EGL_ERROR(disp, EGL_BAD_NATIVE_PIXMAP, EGL_NO_SURFACE);
}
- _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
+ _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE);
if ((conf->SurfaceType & EGL_PIXMAP_BIT) == 0)
RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE);
if (_eglNativeSurfaceAlreadyUsed(disp, native_pixmap))
RETURN_EGL_ERROR(disp, EGL_BAD_ALLOC, EGL_NO_SURFACE);
- surf = drv->CreatePixmapSurface(disp, conf, native_pixmap, attrib_list);
+ surf = disp->Driver->CreatePixmapSurface(disp, conf, native_pixmap, attrib_list);
ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
RETURN_EGL_EVAL(disp, ret);
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLConfig *conf = _eglLookupConfig(config, disp);
- const _EGLDriver *drv;
_EGLSurface *surf;
EGLSurface ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_NO_SURFACE);
- _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
+ _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE);
if ((conf->SurfaceType & EGL_PBUFFER_BIT) == 0)
RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE);
- surf = drv->CreatePbufferSurface(disp, conf, attrib_list);
+ surf = disp->Driver->CreatePbufferSurface(disp, conf, attrib_list);
ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
RETURN_EGL_EVAL(disp, ret);
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
_eglUnlinkSurface(surf);
- ret = drv->DestroySurface(disp, surf);
+ ret = disp->Driver->DestroySurface(disp, surf);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
- if (drv->QuerySurface)
- ret = drv->QuerySurface(disp, surf, attribute, value);
+ if (disp->Driver->QuerySurface)
+ ret = disp->Driver->QuerySurface(disp, surf, attribute, value);
else
ret = _eglQuerySurface(disp, surf, attribute, value);
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
- ret = _eglSurfaceAttrib(drv, disp, surf, attribute, value);
+ ret = _eglSurfaceAttrib(disp, surf, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
- ret = drv->BindTexImage(disp, surf, buffer);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
+ ret = disp->Driver->BindTexImage(disp, surf, buffer);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
- ret = drv->ReleaseTexImage(disp, surf, buffer);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
+ ret = disp->Driver->ReleaseTexImage(disp, surf, buffer);
RETURN_EGL_EVAL(disp, ret);
}
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLContext *ctx = _eglGetCurrentContext();
_EGLSurface *surf = ctx ? ctx->DrawSurface : NULL;
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
if (_eglGetContextHandle(ctx) == EGL_NO_CONTEXT ||
ctx->Resource.Display != disp)
surf->Config->MaxSwapInterval);
if (surf->SwapInterval != interval) {
- if (drv->SwapInterval)
- ret = drv->SwapInterval(disp, surf, interval);
+ if (disp->Driver->SwapInterval)
+ ret = disp->Driver->SwapInterval(disp, surf, interval);
else
ret = _eglSwapInterval(disp, surf, interval);
}
_EGLContext *ctx = _eglGetCurrentContext();
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
/* surface must be bound to current context in EGL 1.4 */
#ifndef _EGL_BUILT_IN_DRIVER_HAIKU
if (surf->Lost)
RETURN_EGL_ERROR(disp, EGL_BAD_NATIVE_WINDOW, EGL_FALSE);
- ret = drv->SwapBuffers(disp, surf);
+ ret = disp->Driver->SwapBuffers(disp, surf);
/* EGL_KHR_partial_update
* Frame boundary successfully reached,
const EGLint *rects, EGLint n_rects)
{
_EGLContext *ctx = _eglGetCurrentContext();
- const _EGLDriver *drv;
EGLBoolean ret;
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
/* surface must be bound to current context in EGL 1.4 */
if (_eglGetContextHandle(ctx) == EGL_NO_CONTEXT ||
if ((n_rects > 0 && rects == NULL) || n_rects < 0)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->SwapBuffersWithDamageEXT(disp, surf, rects, n_rects);
+ ret = disp->Driver->SwapBuffersWithDamageEXT(disp, surf, rects, n_rects);
/* EGL_KHR_partial_update
* Frame boundary successfully reached,
*/
static void
-_eglSetDamageRegionKHRClampRects(_EGLDisplay* disp, _EGLSurface* surf,
+_eglSetDamageRegionKHRClampRects(_EGLSurface* surf,
EGLint *rects, EGLint n_rects)
{
EGLint i;
_EGLSurface *surf = _eglLookupSurface(surface, disp);
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
_EGLContext *ctx = _eglGetCurrentContext();
- const _EGLDriver *drv;
EGLBoolean ret;
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
if (_eglGetContextHandle(ctx) == EGL_NO_CONTEXT ||
surf->Type != EGL_WINDOW_BIT ||
if (surf->SetDamageRegionCalled || !surf->BufferAgeRead)
RETURN_EGL_ERROR(disp, EGL_BAD_ACCESS, EGL_FALSE);
- _eglSetDamageRegionKHRClampRects(disp, surf, rects, n_rects);
- ret = drv->SetDamageRegion(disp, surf, rects, n_rects);
+ _eglSetDamageRegionKHRClampRects(surf, rects, n_rects);
+ ret = disp->Driver->SetDamageRegion(disp, surf, rects, n_rects);
if (ret)
surf->SetDamageRegionCalled = EGL_TRUE;
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
void *native_pixmap_ptr;
STATIC_ASSERT(sizeof(void*) == sizeof(target));
native_pixmap_ptr = (void*) target;
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
- ret = drv->CopyBuffers(disp, surf, native_pixmap_ptr);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
+ ret = disp->Driver->CopyBuffers(disp, surf, native_pixmap_ptr);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLConfig *conf = _eglLookupConfig(config, disp);
- const _EGLDriver *drv;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_NO_SURFACE);
- _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
+ _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE);
/* OpenVG is not supported */
RETURN_EGL_ERROR(disp, EGL_BAD_ALLOC, EGL_NO_SURFACE);
EGLClientBuffer buffer, const EGLint *attr_list)
{
_EGLContext *context = _eglLookupContext(ctx, disp);
- const _EGLDriver *drv;
_EGLImage *img;
EGLImage ret;
- _EGL_CHECK_DISPLAY(disp, EGL_NO_IMAGE_KHR, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_NO_IMAGE_KHR);
if (!disp->Extensions.KHR_image_base)
RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
if (!context && ctx != EGL_NO_CONTEXT)
if (ctx != EGL_NO_CONTEXT && target == EGL_LINUX_DMA_BUF_EXT)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
- img = drv->CreateImageKHR(disp, context, target, buffer, attr_list);
+ img = disp->Driver->CreateImageKHR(disp, context, target, buffer, attr_list);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
static EGLBoolean
_eglDestroyImageCommon(_EGLDisplay *disp, _EGLImage *img)
{
- const _EGLDriver *drv;
EGLBoolean ret;
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
if (!disp->Extensions.KHR_image_base)
RETURN_EGL_EVAL(disp, EGL_FALSE);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
_eglUnlinkImage(img);
- ret = drv->DestroyImageKHR(disp, img);
+ ret = disp->Driver->DestroyImageKHR(disp, img);
RETURN_EGL_EVAL(disp, ret);
}
EGLenum invalid_type_error)
{
_EGLContext *ctx = _eglGetCurrentContext();
- const _EGLDriver *drv;
_EGLSync *sync;
EGLSync ret;
- _EGL_CHECK_DISPLAY(disp, EGL_NO_SYNC_KHR, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_NO_SYNC_KHR);
if (!disp->Extensions.KHR_cl_event2 && orig_is_EGLAttrib) {
/* There exist two EGLAttrib variants of eglCreateSync*:
RETURN_EGL_ERROR(disp, invalid_type_error, EGL_NO_SYNC_KHR);
}
- sync = drv->CreateSyncKHR(disp, type, attrib_list);
+ sync = disp->Driver->CreateSyncKHR(disp, type, attrib_list);
ret = (sync) ? _eglLinkSync(sync) : EGL_NO_SYNC_KHR;
RETURN_EGL_EVAL(disp, ret);
static EGLBoolean
_eglDestroySync(_EGLDisplay *disp, _EGLSync *s)
{
- const _EGLDriver *drv;
EGLBoolean ret;
- _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
+ _EGL_CHECK_SYNC(disp, s, EGL_FALSE);
assert(disp->Extensions.KHR_reusable_sync ||
disp->Extensions.KHR_fence_sync ||
disp->Extensions.ANDROID_native_fence_sync);
_eglUnlinkSync(s);
- ret = drv->DestroySyncKHR(disp, s);
+ ret = disp->Driver->DestroySyncKHR(disp, s);
RETURN_EGL_EVAL(disp, ret);
}
_eglClientWaitSyncCommon(_EGLDisplay *disp, EGLDisplay dpy,
_EGLSync *s, EGLint flags, EGLTime timeout)
{
- const _EGLDriver *drv;
EGLint ret;
- _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
+ _EGL_CHECK_SYNC(disp, s, EGL_FALSE);
assert(disp->Extensions.KHR_reusable_sync ||
disp->Extensions.KHR_fence_sync ||
disp->Extensions.ANDROID_native_fence_sync);
if (s->Type == EGL_SYNC_REUSABLE_KHR)
_eglUnlockDisplay(dpy);
- ret = drv->ClientWaitSyncKHR(disp, s, flags, timeout);
+ ret = disp->Driver->ClientWaitSyncKHR(disp, s, flags, timeout);
/*
* 'disp' is already unlocked for reusable sync type,
_eglWaitSyncCommon(_EGLDisplay *disp, _EGLSync *s, EGLint flags)
{
_EGLContext *ctx = _eglGetCurrentContext();
- const _EGLDriver *drv;
EGLint ret;
- _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
+ _EGL_CHECK_SYNC(disp, s, EGL_FALSE);
assert(disp->Extensions.KHR_wait_sync);
/* return an error if the client API doesn't support GL_[OES|MESA]_EGL_sync. */
if (flags != 0)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->WaitSyncKHR(disp, s);
+ ret = disp->Driver->WaitSyncKHR(disp, s);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSync *s = _eglLookupSync(sync, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SYNC_KHR, s, EGL_FALSE);
- _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
+ _EGL_CHECK_SYNC(disp, s, EGL_FALSE);
assert(disp->Extensions.KHR_reusable_sync);
- ret = drv->SignalSyncKHR(disp, s, mode);
+ ret = disp->Driver->SignalSyncKHR(disp, s, mode);
RETURN_EGL_EVAL(disp, ret);
}
static EGLBoolean
_eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAttrib *value)
{
- const _EGLDriver *drv;
EGLBoolean ret;
- _EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
+ _EGL_CHECK_SYNC(disp, s, EGL_FALSE);
assert(disp->Extensions.KHR_reusable_sync ||
disp->Extensions.KHR_fence_sync ||
disp->Extensions.ANDROID_native_fence_sync);
- ret = _eglGetSyncAttrib(drv, disp, s, attribute, value);
+ ret = _eglGetSyncAttrib(disp, s, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSync *s = _eglLookupSync(sync, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SYNC_KHR, s, EGL_FALSE);
if (!(s && (s->Type == EGL_SYNC_NATIVE_FENCE_ANDROID)))
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_NO_NATIVE_FENCE_FD_ANDROID);
- _EGL_CHECK_SYNC(disp, s, EGL_NO_NATIVE_FENCE_FD_ANDROID, drv);
+ _EGL_CHECK_SYNC(disp, s, EGL_NO_NATIVE_FENCE_FD_ANDROID);
assert(disp->Extensions.ANDROID_native_fence_sync);
- ret = drv->DupNativeFenceFDANDROID(disp, s);
+ ret = disp->Driver->DupNativeFenceFDANDROID(disp, s);
RETURN_EGL_EVAL(disp, ret);
}
_EGLContext *ctx = _eglGetCurrentContext();
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
if (!disp->Extensions.NOK_swap_region)
RETURN_EGL_EVAL(disp, EGL_FALSE);
surf != ctx->DrawSurface)
RETURN_EGL_ERROR(disp, EGL_BAD_SURFACE, EGL_FALSE);
- ret = drv->SwapBuffersRegionNOK(disp, surf, numRects, rects);
+ ret = disp->Driver->SwapBuffersRegionNOK(disp, surf, numRects, rects);
RETURN_EGL_EVAL(disp, ret);
}
eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attr_list)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
_EGLImage *img;
EGLImage ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_NO_IMAGE_KHR, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_NO_IMAGE_KHR);
if (!disp->Extensions.MESA_drm_image)
RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
- img = drv->CreateDRMImageMESA(disp, attr_list);
+ img = disp->Driver->CreateDRMImageMESA(disp, attr_list);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLImage *img = _eglLookupImage(image, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_IMAGE_KHR, img, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
assert(disp->Extensions.MESA_drm_image);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->ExportDRMImageMESA(disp, img, name, handle, stride);
+ ret = disp->Driver->ExportDRMImageMESA(disp, img, name, handle, stride);
RETURN_EGL_EVAL(disp, ret);
}
eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
assert(disp->Extensions.WL_bind_wayland_display);
if (!display)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->BindWaylandDisplayWL(disp, display);
+ ret = disp->Driver->BindWaylandDisplayWL(disp, display);
RETURN_EGL_EVAL(disp, ret);
}
eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
assert(disp->Extensions.WL_bind_wayland_display);
if (!display)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->UnbindWaylandDisplayWL(disp, display);
+ ret = disp->Driver->UnbindWaylandDisplayWL(disp, display);
RETURN_EGL_EVAL(disp, ret);
}
EGLint attribute, EGLint *value)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
assert(disp->Extensions.WL_bind_wayland_display);
if (!buffer)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->QueryWaylandBufferWL(disp, buffer, attribute, value);
+ ret = disp->Driver->QueryWaylandBufferWL(disp, buffer, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLImage *img;
- const _EGLDriver *drv;
struct wl_buffer *ret;
_EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, NULL, drv);
+ _EGL_CHECK_DISPLAY(disp, NULL);
if (!disp->Extensions.WL_create_wayland_buffer_from_image)
RETURN_EGL_EVAL(disp, NULL);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, NULL);
- ret = drv->CreateWaylandBufferFromImageWL(disp, img);
+ ret = disp->Driver->CreateWaylandBufferFromImageWL(disp, img);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
if (!disp->Extensions.NV_post_sub_buffer)
RETURN_EGL_EVAL(disp, EGL_FALSE);
- ret = drv->PostSubBufferNV(disp, surf, x, y, width, height);
+ ret = disp->Driver->PostSubBufferNV(disp, surf, x, y, width, height);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLSurface *surf = _eglLookupSurface(surface, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
- _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
+ _EGL_CHECK_SURFACE(disp, surf, EGL_FALSE);
if (!disp->Extensions.CHROMIUM_sync_control)
RETURN_EGL_EVAL(disp, EGL_FALSE);
if (!ust || !msc || !sbc)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->GetSyncValuesCHROMIUM(disp, surf, ust, msc, sbc);
+ ret = disp->Driver->GetSyncValuesCHROMIUM(disp, surf, ust, msc, sbc);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLImage *img = _eglLookupImage(image, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_IMAGE_KHR, img, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
assert(disp->Extensions.MESA_image_dma_buf_export);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->ExportDMABUFImageQueryMESA(disp, img, fourcc, nplanes, modifiers);
+ ret = disp->Driver->ExportDMABUFImageQueryMESA(disp, img, fourcc, nplanes, modifiers);
RETURN_EGL_EVAL(disp, ret);
}
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
_EGLImage *img = _eglLookupImage(image, disp);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(disp, EGL_OBJECT_IMAGE_KHR, img, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
assert(disp->Extensions.MESA_image_dma_buf_export);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->ExportDMABUFImageMESA(disp, img, fds, strides, offsets);
+ ret = disp->Driver->ExportDMABUFImageMESA(disp, img, fds, strides, offsets);
RETURN_EGL_EVAL(disp, ret);
}
EGLint *formats, EGLint *num_formats)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
- ret = drv->QueryDmaBufFormatsEXT(disp, max_formats, formats, num_formats);
+ ret = disp->Driver->QueryDmaBufFormatsEXT(disp, max_formats, formats, num_formats);
RETURN_EGL_EVAL(disp, ret);
}
EGLint *num_modifiers)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
EGLBoolean ret;
_EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
- ret = drv->QueryDmaBufModifiersEXT(disp, format, max_modifiers, modifiers,
+ ret = disp->Driver->QueryDmaBufModifiersEXT(disp, format, max_modifiers, modifiers,
external_only, num_modifiers);
RETURN_EGL_EVAL(disp, ret);
return;
}
- const _EGLDriver *drv = _eglCheckDisplay(disp, __func__);
- if (!drv) {
+ if (!_eglCheckDisplay(disp, __func__)) {
if (disp)
_eglUnlockDisplay(disp);
return;
disp->BlobCacheSet = set;
disp->BlobCacheGet = get;
- drv->SetBlobCacheFuncsANDROID(drv, disp, set, get);
+ disp->Driver->SetBlobCacheFuncsANDROID(disp, set, get);
_eglUnlockDisplay(disp);
}
EGLAttrib *value)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
_EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE);
- _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
+ _EGL_CHECK_DISPLAY(disp, EGL_FALSE);
switch (attribute) {
case EGL_DEVICE_EXT:
eglGetDisplayDriverConfig(EGLDisplay dpy)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
char *ret;
_EGL_FUNC_START(disp, EGL_NONE, NULL, NULL);
- _EGL_CHECK_DISPLAY(disp, NULL, drv);
+ _EGL_CHECK_DISPLAY(disp, NULL);
assert(disp->Extensions.MESA_query_driver);
- ret = drv->QueryDriverConfig(disp);
+ ret = disp->Driver->QueryDriverConfig(disp);
RETURN_EGL_EVAL(disp, ret);
}
eglGetDisplayDriverName(EGLDisplay dpy)
{
_EGLDisplay *disp = _eglLockDisplay(dpy);
- const _EGLDriver *drv;
const char *ret;
_EGL_FUNC_START(disp, EGL_NONE, NULL, NULL);
- _EGL_CHECK_DISPLAY(disp, NULL, drv);
+ _EGL_CHECK_DISPLAY(disp, NULL);
assert(disp->Extensions.MESA_query_driver);
- ret = drv->QueryDriverName(disp);
+ ret = disp->Driver->QueryDriverName(disp);
RETURN_EGL_EVAL(disp, ret);
}
static int
_eglLockDisplayInterop(EGLDisplay dpy, EGLContext context,
- _EGLDisplay **disp, const _EGLDriver **drv,
- _EGLContext **ctx)
+ _EGLDisplay **disp, _EGLContext **ctx)
{
*disp = _eglLockDisplay(dpy);
return MESA_GLINTEROP_INVALID_DISPLAY;
}
- *drv = (*disp)->Driver;
-
*ctx = _eglLookupContext(context, *disp);
if (!*ctx ||
((*ctx)->ClientAPI != EGL_OPENGL_API &&
struct mesa_glinterop_device_info *out)
{
_EGLDisplay *disp;
- const _EGLDriver *drv;
_EGLContext *ctx;
int ret;
- ret = _eglLockDisplayInterop(dpy, context, &disp, &drv, &ctx);
+ ret = _eglLockDisplayInterop(dpy, context, &disp, &ctx);
if (ret != MESA_GLINTEROP_SUCCESS)
return ret;
- if (drv->GLInteropQueryDeviceInfo)
- ret = drv->GLInteropQueryDeviceInfo(disp, ctx, out);
+ if (disp->Driver->GLInteropQueryDeviceInfo)
+ ret = disp->Driver->GLInteropQueryDeviceInfo(disp, ctx, out);
else
ret = MESA_GLINTEROP_UNSUPPORTED;
struct mesa_glinterop_export_out *out)
{
_EGLDisplay *disp;
- const _EGLDriver *drv;
_EGLContext *ctx;
int ret;
- ret = _eglLockDisplayInterop(dpy, context, &disp, &drv, &ctx);
+ ret = _eglLockDisplayInterop(dpy, context, &disp, &ctx);
if (ret != MESA_GLINTEROP_SUCCESS)
return ret;
- if (drv->GLInteropExportObject)
- ret = drv->GLInteropExportObject(disp, ctx, in, out);
+ if (disp->Driver->GLInteropExportObject)
+ ret = disp->Driver->GLInteropExportObject(disp, ctx, in, out);
else
ret = MESA_GLINTEROP_UNSUPPORTED;