projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl: drop unused _EGLDriver from QueryDmaBuf{Formats,Modifiers}EXT()
[mesa.git]
/
src
/
egl
/
main
/
eglapi.c
diff --git
a/src/egl/main/eglapi.c
b/src/egl/main/eglapi.c
index 5b78c9bae26389760f114edb83644b77a0174354..39e1ca2c7e05473a8848595095f3e5bcb5a1abd0 100644
(file)
--- a/
src/egl/main/eglapi.c
+++ b/
src/egl/main/eglapi.c
@@
-1456,7
+1456,7
@@
eglSetDamageRegionKHR(EGLDisplay dpy, EGLSurface surface,
RETURN_EGL_ERROR(disp, EGL_BAD_ACCESS, EGL_FALSE);
_eglSetDamageRegionKHRClampRects(disp, surf, rects, n_rects);
RETURN_EGL_ERROR(disp, EGL_BAD_ACCESS, EGL_FALSE);
_eglSetDamageRegionKHRClampRects(disp, surf, rects, n_rects);
- ret = drv->SetDamageRegion(d
rv, d
isp, surf, rects, n_rects);
+ ret = drv->SetDamageRegion(disp, surf, rects, n_rects);
if (ret)
surf->SetDamageRegionCalled = EGL_TRUE;
if (ret)
surf->SetDamageRegionCalled = EGL_TRUE;
@@
-1478,7
+1478,7
@@
eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
native_pixmap_ptr = (void*) target;
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
native_pixmap_ptr = (void*) target;
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
- ret = drv->CopyBuffers(d
rv, d
isp, surf, native_pixmap_ptr);
+ ret = drv->CopyBuffers(disp, surf, native_pixmap_ptr);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-1489,7
+1489,6
@@
_eglWaitClientCommon(void)
{
_EGLContext *ctx = _eglGetCurrentContext();
_EGLDisplay *disp;
{
_EGLContext *ctx = _eglGetCurrentContext();
_EGLDisplay *disp;
- const _EGLDriver *drv;
EGLBoolean ret;
if (!ctx)
EGLBoolean ret;
if (!ctx)
@@
-1505,8
+1504,7
@@
_eglWaitClientCommon(void)
/* a valid current context implies an initialized current display */
assert(disp->Initialized);
/* a valid current context implies an initialized current display */
assert(disp->Initialized);
- drv = disp->Driver;
- ret = drv->WaitClient(drv, disp, ctx);
+ ret = disp->Driver->WaitClient(disp, ctx);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-1532,7
+1530,6
@@
eglWaitNative(EGLint engine)
{
_EGLContext *ctx = _eglGetCurrentContext();
_EGLDisplay *disp;
{
_EGLContext *ctx = _eglGetCurrentContext();
_EGLDisplay *disp;
- const _EGLDriver *drv;
EGLBoolean ret;
if (!ctx)
EGLBoolean ret;
if (!ctx)
@@
-1550,8
+1547,7
@@
eglWaitNative(EGLint engine)
/* a valid current context implies an initialized current display */
assert(disp->Initialized);
/* a valid current context implies an initialized current display */
assert(disp->Initialized);
- drv = disp->Driver;
- ret = drv->WaitNative(drv, disp, engine);
+ ret = disp->Driver->WaitNative(engine);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-1738,8
+1734,7
@@
_eglCreateImageCommon(_EGLDisplay *disp, EGLContext ctx, EGLenum target,
if (ctx != EGL_NO_CONTEXT && target == EGL_LINUX_DMA_BUF_EXT)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
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(drv, disp, context, target,
- buffer, attr_list);
+ img = drv->CreateImageKHR(disp, context, target, buffer, attr_list);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
@@
-1788,7
+1783,7
@@
_eglDestroyImageCommon(_EGLDisplay *disp, _EGLImage *img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
_eglUnlinkImage(img);
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
_eglUnlinkImage(img);
- ret = drv->DestroyImageKHR(d
rv, d
isp, img);
+ ret = drv->DestroyImageKHR(disp, img);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-1872,7
+1867,7
@@
_eglCreateSync(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list,
RETURN_EGL_ERROR(disp, invalid_type_error, EGL_NO_SYNC_KHR);
}
RETURN_EGL_ERROR(disp, invalid_type_error, EGL_NO_SYNC_KHR);
}
- sync = drv->CreateSyncKHR(d
rv, d
isp, type, attrib_list);
+ sync = drv->CreateSyncKHR(disp, type, attrib_list);
ret = (sync) ? _eglLinkSync(sync) : EGL_NO_SYNC_KHR;
RETURN_EGL_EVAL(disp, ret);
ret = (sync) ? _eglLinkSync(sync) : EGL_NO_SYNC_KHR;
RETURN_EGL_EVAL(disp, ret);
@@
-1940,7
+1935,7
@@
_eglDestroySync(_EGLDisplay *disp, _EGLSync *s)
disp->Extensions.ANDROID_native_fence_sync);
_eglUnlinkSync(s);
disp->Extensions.ANDROID_native_fence_sync);
_eglUnlinkSync(s);
- ret = drv->DestroySyncKHR(d
rv, d
isp, s);
+ ret = drv->DestroySyncKHR(disp, s);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-1987,7
+1982,7
@@
_eglClientWaitSyncCommon(_EGLDisplay *disp, EGLDisplay dpy,
if (s->Type == EGL_SYNC_REUSABLE_KHR)
_eglUnlockDisplay(dpy);
if (s->Type == EGL_SYNC_REUSABLE_KHR)
_eglUnlockDisplay(dpy);
- ret = drv->ClientWaitSyncKHR(d
rv, d
isp, s, flags, timeout);
+ ret = drv->ClientWaitSyncKHR(disp, s, flags, timeout);
/*
* 'disp' is already unlocked for reusable sync type,
/*
* 'disp' is already unlocked for reusable sync type,
@@
-2040,7
+2035,7
@@
_eglWaitSyncCommon(_EGLDisplay *disp, _EGLSync *s, EGLint flags)
if (flags != 0)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (flags != 0)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->WaitSyncKHR(d
rv, d
isp, s);
+ ret = drv->WaitSyncKHR(disp, s);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2081,7
+2076,7
@@
eglSignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode)
_EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
assert(disp->Extensions.KHR_reusable_sync);
_EGL_CHECK_SYNC(disp, s, EGL_FALSE, drv);
assert(disp->Extensions.KHR_reusable_sync);
- ret = drv->SignalSyncKHR(d
rv, d
isp, s, mode);
+ ret = drv->SignalSyncKHR(disp, s, mode);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2163,7
+2158,7
@@
eglDupNativeFenceFDANDROID(EGLDisplay dpy, EGLSync sync)
_EGL_CHECK_SYNC(disp, s, EGL_NO_NATIVE_FENCE_FD_ANDROID, drv);
assert(disp->Extensions.ANDROID_native_fence_sync);
_EGL_CHECK_SYNC(disp, s, EGL_NO_NATIVE_FENCE_FD_ANDROID, drv);
assert(disp->Extensions.ANDROID_native_fence_sync);
- ret = drv->DupNativeFenceFDANDROID(d
rv, d
isp, s);
+ ret = drv->DupNativeFenceFDANDROID(disp, s);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2210,7
+2205,7
@@
eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attr_list)
if (!disp->Extensions.MESA_drm_image)
RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
if (!disp->Extensions.MESA_drm_image)
RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
- img = drv->CreateDRMImageMESA(d
rv, d
isp, attr_list);
+ img = drv->CreateDRMImageMESA(disp, attr_list);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
@@
-2233,7
+2228,7
@@
eglExportDRMImageMESA(EGLDisplay dpy, EGLImage image,
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->ExportDRMImageMESA(d
rv, d
isp, img, name, handle, stride);
+ ret = drv->ExportDRMImageMESA(disp, img, name, handle, stride);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2256,7
+2251,7
@@
eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
if (!display)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (!display)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->BindWaylandDisplayWL(d
rv, d
isp, display);
+ ret = drv->BindWaylandDisplayWL(disp, display);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2276,7
+2271,7
@@
eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
if (!display)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (!display)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->UnbindWaylandDisplayWL(d
rv, d
isp, display);
+ ret = drv->UnbindWaylandDisplayWL(disp, display);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2297,7
+2292,7
@@
eglQueryWaylandBufferWL(EGLDisplay dpy, struct wl_resource *buffer,
if (!buffer)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (!buffer)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->QueryWaylandBufferWL(d
rv, d
isp, buffer, attribute, value);
+ ret = drv->QueryWaylandBufferWL(disp, buffer, attribute, value);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2322,7
+2317,7
@@
eglCreateWaylandBufferFromImageWL(EGLDisplay dpy, EGLImage image)
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, NULL);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, NULL);
- ret = drv->CreateWaylandBufferFromImageWL(d
rv, d
isp, img);
+ ret = drv->CreateWaylandBufferFromImageWL(disp, img);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2343,7
+2338,7
@@
eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface,
if (!disp->Extensions.NV_post_sub_buffer)
RETURN_EGL_EVAL(disp, EGL_FALSE);
if (!disp->Extensions.NV_post_sub_buffer)
RETURN_EGL_EVAL(disp, EGL_FALSE);
- ret = drv->PostSubBufferNV(d
rv, d
isp, surf, x, y, width, height);
+ ret = drv->PostSubBufferNV(disp, surf, x, y, width, height);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2390,8
+2385,7
@@
eglExportDMABUFImageQueryMESA(EGLDisplay dpy, EGLImage image,
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->ExportDMABUFImageQueryMESA(drv, disp, img, fourcc, nplanes,
- modifiers);
+ ret = drv->ExportDMABUFImageQueryMESA(disp, img, fourcc, nplanes, modifiers);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2413,7
+2407,7
@@
eglExportDMABUFImageMESA(EGLDisplay dpy, EGLImage image,
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
- ret = drv->ExportDMABUFImageMESA(d
rv, d
isp, img, fds, strides, offsets);
+ ret = drv->ExportDMABUFImageMESA(disp, img, fds, strides, offsets);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2577,8
+2571,7
@@
eglQueryDmaBufFormatsEXT(EGLDisplay dpy, EGLint max_formats,
_EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
_EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
- ret = drv->QueryDmaBufFormatsEXT(drv, disp, max_formats, formats,
- num_formats);
+ ret = drv->QueryDmaBufFormatsEXT(disp, max_formats, formats, num_formats);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}
@@
-2596,9
+2589,8
@@
eglQueryDmaBufModifiersEXT(EGLDisplay dpy, EGLint format, EGLint max_modifiers,
_EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
_EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv);
- ret = drv->QueryDmaBufModifiersEXT(drv, disp, format, max_modifiers,
- modifiers, external_only,
- num_modifiers);
+ ret = drv->QueryDmaBufModifiersEXT(disp, format, max_modifiers, modifiers,
+ external_only, num_modifiers);
RETURN_EGL_EVAL(disp, ret);
}
RETURN_EGL_EVAL(disp, ret);
}