X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fdrivers%2Fdri2%2Fegl_dri2.h;h=f471561ed0ce113f1e72e67cbc540ba5731d9014;hb=2db95482964caf872f8f4b0ad6e0c34b3402c774;hp=a835f8ed320f7a2d3c624c761b7b7f98ace4ea35;hpb=bc2cbc0951ded883dc610672a6f6d4cca5d99502;p=mesa.git diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index a835f8ed320..f471561ed0c 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -28,16 +28,25 @@ #ifndef EGL_DRI2_INCLUDED #define EGL_DRI2_INCLUDED +#include +#include + #ifdef HAVE_X11_PLATFORM #include #include #include #include + +#ifdef HAVE_DRI3 +#include "loader_dri3_helper.h" +#endif #endif #ifdef HAVE_WAYLAND_PLATFORM #include #include "wayland-egl-priv.h" +/* forward declarations of protocol elements */ +struct zwp_linux_dmabuf_v1; #endif #include @@ -50,17 +59,9 @@ #ifdef HAVE_ANDROID_PLATFORM #define LOG_TAG "EGL-DRI2" -#if ANDROID_VERSION >= 0x0400 -# include -#else -# define android_native_buffer_t ANativeWindowBuffer -# include -# include -#endif - +#include #include #include -#include #endif /* HAVE_ANDROID_PLATFORM */ @@ -72,8 +73,11 @@ #include "egllog.h" #include "eglsurface.h" #include "eglimage.h" +#include "eglsync.h" + +#include "util/u_vector.h" -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +struct wl_buffer; struct dri2_egl_driver { @@ -89,12 +93,12 @@ struct dri2_egl_display_vtbl { _EGLSurface* (*create_window_surface)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLConfig *config, - EGLNativeWindowType window, + void *native_window, const EGLint *attrib_list); _EGLSurface* (*create_pixmap_surface)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLConfig *config, - EGLNativePixmapType pixmap, + void *native_pixmap, const EGLint *attrib_list); _EGLSurface* (*create_pbuffer_surface)(_EGLDriver *drv, _EGLDisplay *dpy, @@ -107,18 +111,51 @@ struct dri2_egl_display_vtbl { EGLBoolean (*swap_interval)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf, EGLint interval); + _EGLImage* (*create_image)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLContext *ctx, EGLenum target, + EGLClientBuffer buffer, + const EGLint *attr_list); + EGLBoolean (*swap_buffers)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf); - EGLBoolean (*swap_buffers_with_damage)(_EGLDriver *drv, _EGLDisplay *dpy, - _EGLSurface *surface, - const EGLint *rects, EGLint n_rects); + EGLBoolean (*swap_buffers_with_damage)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface *surface, + const EGLint *rects, EGLint n_rects); + + EGLBoolean (*set_damage_region)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface *surface, + const EGLint *rects, EGLint n_rects); + + EGLBoolean (*swap_buffers_region)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface *surf, EGLint numRects, + const EGLint *rects); + + EGLBoolean (*post_sub_buffer)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface *surf, + EGLint x, EGLint y, + EGLint width, EGLint height); EGLBoolean (*copy_buffers)(_EGLDriver *drv, _EGLDisplay *dpy, - _EGLSurface *surf, EGLNativePixmapType target); + _EGLSurface *surf, void *native_pixmap_target); EGLint (*query_buffer_age)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf); + + EGLBoolean (*query_surface)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface *surf, EGLint attribute, + EGLint *value); + + struct wl_buffer* (*create_wayland_buffer_from_image)( + _EGLDriver *drv, _EGLDisplay *dpy, _EGLImage *img); + + EGLBoolean (*get_sync_values)(_EGLDisplay *display, _EGLSurface *surface, + EGLuint64KHR *ust, EGLuint64KHR *msc, + EGLuint64KHR *sbc); + + __DRIdrawable *(*get_dri_drawable)(_EGLSurface *surf); + + void (*close_screen_notify)(_EGLDisplay *dpy); }; struct dri2_egl_display @@ -128,22 +165,30 @@ struct dri2_egl_display int dri2_major; int dri2_minor; __DRIscreen *dri_screen; - int own_dri_screen; + bool own_dri_screen; const __DRIconfig **driver_configs; void *driver; - __DRIcoreExtension *core; - __DRIdri2Extension *dri2; - __DRIswrastExtension *swrast; - __DRI2flushExtension *flush; - __DRItexBufferExtension *tex_buffer; - __DRIimageExtension *image; - __DRIrobustnessExtension *robustness; - __DRI2configQueryExtension *config; + const __DRIcoreExtension *core; + const __DRIimageDriverExtension *image_driver; + const __DRIdri2Extension *dri2; + const __DRIswrastExtension *swrast; + const __DRI2flushExtension *flush; + const __DRItexBufferExtension *tex_buffer; + const __DRIimageExtension *image; + const __DRIrobustnessExtension *robustness; + const __DRInoErrorExtension *no_error; + const __DRI2configQueryExtension *config; + const __DRI2fenceExtension *fence; + const __DRI2rendererQueryExtension *rendererQuery; + const __DRI2interopExtension *interop; int fd; - int own_device; - int swap_available; - int invalidate_available; + /* dri2_initialize/dri2_terminate increment/decrement this count, so does + * dri2_make_current (tracks if there are active contexts/surfaces). */ + int ref_count; + + bool own_device; + bool invalidate_available; int min_swap_interval; int max_swap_interval; int default_swap_interval; @@ -151,28 +196,46 @@ struct dri2_egl_display struct gbm_dri_device *gbm_dri; #endif - char *device_name; char *driver_name; - __DRIdri2LoaderExtension dri2_loader_extension; - __DRIswrastLoaderExtension swrast_loader_extension; - const __DRIextension *extensions[5]; + const __DRIextension **loader_extensions; const __DRIextension **driver_extensions; #ifdef HAVE_X11_PLATFORM xcb_connection_t *conn; + xcb_screen_t *screen; + bool swap_available; +#ifdef HAVE_DRI3 + struct loader_dri3_extensions loader_dri3_ext; +#endif #endif #ifdef HAVE_WAYLAND_PLATFORM struct wl_display *wl_dpy; + struct wl_display *wl_dpy_wrapper; struct wl_registry *wl_registry; struct wl_drm *wl_server_drm; struct wl_drm *wl_drm; + struct wl_shm *wl_shm; struct wl_event_queue *wl_queue; - int authenticated; - int formats; + struct zwp_linux_dmabuf_v1 *wl_dmabuf; + struct { + struct u_vector xrgb8888; + struct u_vector argb8888; + struct u_vector rgb565; + } wl_modifiers; + bool authenticated; + int formats; uint32_t capabilities; + char *device_name; #endif + +#ifdef HAVE_ANDROID_PLATFORM + const gralloc_module_t *gralloc; +#endif + + bool is_render_node; + bool is_different_gpu; }; struct dri2_egl_context @@ -195,8 +258,7 @@ struct dri2_egl_surface _EGLSurface base; __DRIdrawable *dri_drawable; __DRIbuffer buffers[5]; - int buffer_count; - int have_fake_front; + bool have_fake_front; #ifdef HAVE_X11_PLATFORM xcb_drawable_t drawable; @@ -211,8 +273,12 @@ struct dri2_egl_surface struct wl_egl_window *wl_win; int dx; int dy; + struct wl_event_queue *wl_queue; + struct wl_surface *wl_surface_wrapper; + struct wl_display *wl_dpy_wrapper; + struct wl_drm *wl_drm_wrapper; struct wl_callback *throttle_callback; - int format; + int format; #endif #ifdef HAVE_DRM_PLATFORM @@ -225,11 +291,16 @@ struct dri2_egl_surface #ifdef HAVE_WAYLAND_PLATFORM struct wl_buffer *wl_buffer; __DRIimage *dri_image; + /* for is_different_gpu case. NULL else */ + __DRIimage *linear_copy; + /* for swrast */ + void *data; + int data_size; #endif #ifdef HAVE_DRM_PLATFORM struct gbm_bo *bo; #endif - int locked; + bool locked; int age; } color_buffers[4], *back, *current; #endif @@ -237,18 +308,32 @@ struct dri2_egl_surface #ifdef HAVE_ANDROID_PLATFORM struct ANativeWindow *window; struct ANativeWindowBuffer *buffer; + __DRIimage *dri_image_back; + __DRIimage *dri_image_front; /* EGL-owned buffers */ __DRIbuffer *local_buffers[__DRI_BUFFER_COUNT]; + + /* Used to record all the buffers created by ANativeWindow and their ages. + * Usually Android uses at most triple buffers in ANativeWindow + * so hardcode the number of color_buffers to 3. + */ + struct { + struct ANativeWindowBuffer *buffer; + int age; + } color_buffers[3], *back; #endif -}; +#if defined(HAVE_SURFACELESS_PLATFORM) + __DRIimage *front; + unsigned int visual; +#endif +}; struct dri2_egl_config { _EGLConfig base; - const __DRIconfig *dri_single_config; - const __DRIconfig *dri_double_config; + const __DRIconfig *dri_config[2][2]; }; struct dri2_egl_image @@ -257,6 +342,14 @@ struct dri2_egl_image __DRIimage *dri_image; }; +struct dri2_egl_sync { + _EGLSync base; + mtx_t mutex; + cnd_t cond; + int refcount; + void *fence; +}; + /* From xmlpool/options.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 @@ -266,9 +359,11 @@ struct dri2_egl_image /* standard typecasts */ _EGL_DRIVER_STANDARD_TYPECASTS(dri2_egl) _EGL_DRIVER_TYPECAST(dri2_egl_image, _EGLImage, obj) +_EGL_DRIVER_TYPECAST(dri2_egl_sync, _EGLSync, obj) extern const __DRIimageLookupExtension image_lookup_extension; extern const __DRIuseInvalidateExtension use_invalidate; +extern const __DRIbackgroundCallableExtension background_callable_extension; EGLBoolean dri2_load_driver(_EGLDisplay *disp); @@ -277,24 +372,40 @@ dri2_load_driver(_EGLDisplay *disp); void dri2_setup_screen(_EGLDisplay *disp); +void +dri2_setup_swap_interval(_EGLDisplay *disp, int max_swap_interval); + EGLBoolean dri2_load_driver_swrast(_EGLDisplay *disp); +EGLBoolean +dri2_load_driver_dri3(_EGLDisplay *disp); + EGLBoolean dri2_create_screen(_EGLDisplay *disp); +EGLBoolean +dri2_setup_extensions(_EGLDisplay *disp); + +__DRIdrawable * +dri2_surface_get_dri_drawable(_EGLSurface *surf); + __DRIimage * dri2_lookup_egl_image(__DRIscreen *screen, void *image, void *data); struct dri2_egl_config * dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id, - EGLint surface_type, const EGLint *attr_list, - const unsigned int *rgba_masks); + EGLint surface_type, const EGLint *attr_list, + const unsigned int *rgba_masks); _EGLImage * dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, - _EGLContext *ctx, EGLenum target, - EGLClientBuffer buffer, const EGLint *attr_list); + _EGLContext *ctx, EGLenum target, + EGLClientBuffer buffer, const EGLint *attr_list); + +_EGLImage * +dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, + EGLClientBuffer buffer, const EGLint *attr_list); EGLBoolean dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp); @@ -308,4 +419,41 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp); EGLBoolean dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp); +EGLBoolean +dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp); + +void +dri2_flush_drawable_for_swapbuffers(_EGLDisplay *disp, _EGLSurface *draw); + +const __DRIconfig * +dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type, + EGLenum colorspace); + +static inline void +dri2_set_WL_bind_wayland_display(_EGLDriver *drv, _EGLDisplay *disp) +{ +#ifdef HAVE_WAYLAND_PLATFORM + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); + + (void) drv; + + if (dri2_dpy->device_name && dri2_dpy->image) { + if (dri2_dpy->image->base.version >= 10 && + dri2_dpy->image->getCapabilities != NULL) { + int capabilities; + + capabilities = + dri2_dpy->image->getCapabilities(dri2_dpy->dri_screen); + disp->Extensions.WL_bind_wayland_display = + (capabilities & __DRI_IMAGE_CAP_GLOBAL_NAMES) != 0; + } else { + disp->Extensions.WL_bind_wayland_display = EGL_TRUE; + } + } +#endif +} + +void +dri2_display_destroy(_EGLDisplay *disp); + #endif /* EGL_DRI2_INCLUDED */