X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmain%2Fegldriver.h;h=9cb6323a2e39427e1d1bc1a047f33817832bc579;hb=0e7ae395e72c710be7d153c76222633aa8ab7444;hp=5341b3a336e823dec515e05aceb6314afe4bde46;hpb=82035b2e3db01090f726c2a2c35de9ddf539e2f0;p=mesa.git diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 5341b3a336e..9cb6323a2e3 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -55,14 +55,13 @@ extern "C" { /** - * Define the driver typecast functions for _EGLDriver, _EGLDisplay, + * Define the driver typecast functions for _EGLDisplay, * _EGLContext, _EGLSurface, and _EGLConfig. * * Note that this macro defines several functions and should not be ended with * a semicolon when used. */ #define _EGL_DRIVER_STANDARD_TYPECASTS(drvname) \ - _EGL_DRIVER_TYPECAST(drvname ## _driver, _EGLDriver, obj) \ /* note that this is not a direct cast */ \ _EGL_DRIVER_TYPECAST(drvname ## _display, _EGLDisplay, obj->DriverData) \ _EGL_DRIVER_TYPECAST(drvname ## _context, _EGLContext, obj) \ @@ -118,80 +117,63 @@ struct _egl_driver EGLBoolean (*SwapInterval)(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval); EGLBoolean (*SwapBuffers)(_EGLDisplay *disp, _EGLSurface *draw); - EGLBoolean (*CopyBuffers)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surface, void *native_pixmap_target); - EGLBoolean (*SetDamageRegion)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surface, EGLint *rects, EGLint n_rects); + EGLBoolean (*CopyBuffers)(_EGLDisplay *disp, _EGLSurface *surface, + void *native_pixmap_target); + EGLBoolean (*SetDamageRegion)(_EGLDisplay *disp, _EGLSurface *surface, + EGLint *rects, EGLint n_rects); /* misc functions */ - EGLBoolean (*WaitClient)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLContext *ctx); - EGLBoolean (*WaitNative)(const _EGLDriver *drv, _EGLDisplay *disp, - EGLint engine); + EGLBoolean (*WaitClient)(_EGLDisplay *disp, _EGLContext *ctx); + EGLBoolean (*WaitNative)(EGLint engine); /* this function may be called from multiple threads at the same time */ - _EGLProc (*GetProcAddress)(const _EGLDriver *drv, const char *procname); + _EGLProc (*GetProcAddress)(const char *procname); - _EGLImage *(*CreateImageKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLContext *ctx, EGLenum target, - EGLClientBuffer buffer, + _EGLImage *(*CreateImageKHR)(_EGLDisplay *disp, _EGLContext *ctx, + EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); - EGLBoolean (*DestroyImageKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *image); + EGLBoolean (*DestroyImageKHR)(_EGLDisplay *disp, _EGLImage *image); - _EGLSync *(*CreateSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, EGLenum type, + _EGLSync *(*CreateSyncKHR)(_EGLDisplay *disp, EGLenum type, const EGLAttrib *attrib_list); - EGLBoolean (*DestroySyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync); - EGLint (*ClientWaitSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync, EGLint flags, EGLTime timeout); - EGLint (*WaitSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSync *sync); - EGLBoolean (*SignalSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync, EGLenum mode); - EGLint (*DupNativeFenceFDANDROID)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSync *sync); + EGLBoolean (*DestroySyncKHR)(_EGLDisplay *disp, _EGLSync *sync); + EGLint (*ClientWaitSyncKHR)(_EGLDisplay *disp, _EGLSync *sync, + EGLint flags, EGLTime timeout); + EGLint (*WaitSyncKHR)(_EGLDisplay *disp, _EGLSync *sync); + EGLBoolean (*SignalSyncKHR)(_EGLDisplay *disp, _EGLSync *sync, EGLenum mode); + EGLint (*DupNativeFenceFDANDROID)(_EGLDisplay *disp, _EGLSync *sync); EGLBoolean (*SwapBuffersRegionNOK)(_EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects); - _EGLImage *(*CreateDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - const EGLint *attr_list); - EGLBoolean (*ExportDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, EGLint *name, - EGLint *handle, EGLint *stride); - - EGLBoolean (*BindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_display *display); - EGLBoolean (*UnbindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp, - struct wl_display *display); - EGLBoolean (*QueryWaylandBufferWL)(const _EGLDriver *drv, _EGLDisplay *displ, - struct wl_resource *buffer, - EGLint attribute, EGLint *value); + _EGLImage *(*CreateDRMImageMESA)(_EGLDisplay *disp, const EGLint *attr_list); + EGLBoolean (*ExportDRMImageMESA)(_EGLDisplay *disp, _EGLImage *img, + EGLint *name, EGLint *handle, + EGLint *stride); - struct wl_buffer *(*CreateWaylandBufferFromImageWL)(const _EGLDriver *drv, - _EGLDisplay *disp, - _EGLImage *img); + EGLBoolean (*BindWaylandDisplayWL)(_EGLDisplay *disp, struct wl_display *display); + EGLBoolean (*UnbindWaylandDisplayWL)(_EGLDisplay *disp, struct wl_display *display); + EGLBoolean (*QueryWaylandBufferWL)(_EGLDisplay *displ, struct wl_resource *buffer, + EGLint attribute, EGLint *value); + struct wl_buffer *(*CreateWaylandBufferFromImageWL)(_EGLDisplay *disp, _EGLImage *img); EGLBoolean (*SwapBuffersWithDamageEXT)(_EGLDisplay *disp, _EGLSurface *surface, const EGLint *rects, EGLint n_rects); - EGLBoolean (*PostSubBufferNV)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLSurface *surface, EGLint x, EGLint y, - EGLint width, EGLint height); + EGLBoolean (*PostSubBufferNV)(_EGLDisplay *disp, _EGLSurface *surface, + EGLint x, EGLint y, EGLint width, EGLint height); - EGLint (*QueryBufferAge)(const _EGLDriver *drv, - _EGLDisplay *disp, _EGLSurface *surface); + EGLint (*QueryBufferAge)(_EGLDisplay *disp, _EGLSurface *surface); EGLBoolean (*GetSyncValuesCHROMIUM)(_EGLDisplay *disp, _EGLSurface *surface, EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc); - EGLBoolean (*ExportDMABUFImageQueryMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, EGLint *fourcc, - EGLint *nplanes, + EGLBoolean (*ExportDMABUFImageQueryMESA)(_EGLDisplay *disp, _EGLImage *img, + EGLint *fourcc, EGLint *nplanes, EGLuint64KHR *modifiers); - EGLBoolean (*ExportDMABUFImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp, - _EGLImage *img, EGLint *fds, - EGLint *strides, EGLint *offsets); + EGLBoolean (*ExportDMABUFImageMESA)(_EGLDisplay *disp, _EGLImage *img, + EGLint *fds, EGLint *strides, + EGLint *offsets); int (*GLInteropQueryDeviceInfo)(_EGLDisplay *disp, _EGLContext *ctx, struct mesa_glinterop_device_info *out); @@ -199,18 +181,17 @@ struct _egl_driver struct mesa_glinterop_export_in *in, struct mesa_glinterop_export_out *out); - EGLBoolean (*QueryDmaBufFormatsEXT)(const _EGLDriver *drv, _EGLDisplay *disp, + EGLBoolean (*QueryDmaBufFormatsEXT)(_EGLDisplay *disp, EGLint max_formats, EGLint *formats, EGLint *num_formats); - EGLBoolean (*QueryDmaBufModifiersEXT) (const _EGLDriver *drv, _EGLDisplay *disp, - EGLint format, EGLint max_modifiers, - EGLuint64KHR *modifiers, - EGLBoolean *external_only, - EGLint *num_modifiers); - - void (*SetBlobCacheFuncsANDROID) (const _EGLDriver *drv, _EGLDisplay *disp, - EGLSetBlobFuncANDROID set, - EGLGetBlobFuncANDROID get); + EGLBoolean (*QueryDmaBufModifiersEXT)(_EGLDisplay *disp, EGLint format, + EGLint max_modifiers, EGLuint64KHR *modifiers, + EGLBoolean *external_only, + EGLint *num_modifiers); + + void (*SetBlobCacheFuncsANDROID)(_EGLDisplay *disp, + EGLSetBlobFuncANDROID set, + EGLGetBlobFuncANDROID get); }; @@ -218,10 +199,6 @@ extern bool _eglInitializeDisplay(_EGLDisplay *disp); -extern __eglMustCastToProperFunctionPointerType -_eglGetDriverProc(const char *procname); - - #ifdef __cplusplus } #endif