X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fdrivers%2Fdri2%2Fegl_dri2.h;h=8272da886eeed7ea36febc55f64494e4d1e8508c;hb=c7617d8908a970124321ce731b43d5996c3c5775;hp=f16663712d3f5328d705325cd0d8ce8e1f2600e1;hpb=0e1ff22d55816c9a3710257c2e705a98ad3282bc;p=mesa.git diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index f16663712d3..8272da886ee 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -28,6 +28,7 @@ #ifndef EGL_DRI2_INCLUDED #define EGL_DRI2_INCLUDED +#include #include #ifdef HAVE_X11_PLATFORM @@ -42,8 +43,16 @@ #endif #ifdef HAVE_WAYLAND_PLATFORM -#include -#include "wayland-egl-priv.h" +/* forward declarations to avoid pulling wayland headers everywhere */ +struct wl_egl_window; +struct wl_event_queue; +struct wl_callback; +struct wl_display; +struct wl_drm; +struct wl_registry; +struct wl_shm; +struct wl_surface; +struct zwp_linux_dmabuf_v1; #endif #include @@ -58,13 +67,11 @@ #include #include -#include -#include - #endif /* HAVE_ANDROID_PLATFORM */ #include "eglconfig.h" #include "eglcontext.h" +#include "egldevice.h" #include "egldisplay.h" #include "egldriver.h" #include "eglcurrent.h" @@ -73,79 +80,83 @@ #include "eglimage.h" #include "eglsync.h" -struct wl_buffer; +#include "util/u_vector.h" +#include "util/bitset.h" -struct dri2_egl_driver -{ - _EGLDriver base; +#define EGL_DRI2_MAX_FORMATS 10 - void *handle; - _EGLProc (*get_proc_address)(const char *procname); - void (*glFlush)(void); -}; +struct wl_buffer; struct dri2_egl_display_vtbl { int (*authenticate)(_EGLDisplay *disp, uint32_t id); - _EGLSurface* (*create_window_surface)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface* (*create_window_surface)(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, void *native_window, const EGLint *attrib_list); - _EGLSurface* (*create_pixmap_surface)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface* (*create_pixmap_surface)(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, void *native_pixmap, const EGLint *attrib_list); - _EGLSurface* (*create_pbuffer_surface)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLSurface* (*create_pbuffer_surface)(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *config, const EGLint *attrib_list); - EGLBoolean (*destroy_surface)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*destroy_surface)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface); - EGLBoolean (*swap_interval)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*swap_interval)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval); - _EGLImage* (*create_image)(_EGLDriver *drv, _EGLDisplay *dpy, + _EGLImage* (*create_image)(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); - EGLBoolean (*swap_buffers)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*swap_buffers)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf); - EGLBoolean (*swap_buffers_with_damage)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*swap_buffers_with_damage)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface, const EGLint *rects, EGLint n_rects); - EGLBoolean (*swap_buffers_region)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*swap_buffers_region)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint numRects, const EGLint *rects); - EGLBoolean (*post_sub_buffer)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*post_sub_buffer)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint x, EGLint y, EGLint width, EGLint height); - EGLBoolean (*copy_buffers)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*copy_buffers)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_target); - EGLint (*query_buffer_age)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLint (*query_buffer_age)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf); - EGLBoolean (*query_surface)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLBoolean (*query_surface)(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint attribute, EGLint *value); struct wl_buffer* (*create_wayland_buffer_from_image)( - _EGLDriver *drv, _EGLDisplay *dpy, _EGLImage *img); + _EGLDriver *drv, _EGLDisplay *disp, _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 *disp); + + /* Used in EGL_KHR_mutable_render_buffer to update the native window's + * shared buffer mode. + */ + bool (*set_shared_buffer_mode)(_EGLDisplay *disp, _EGLSurface *surf, + bool mode); }; struct dri2_egl_display @@ -155,7 +166,7 @@ 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; const __DRIcoreExtension *core; @@ -163,21 +174,27 @@ struct dri2_egl_display const __DRIdri2Extension *dri2; const __DRIswrastExtension *swrast; const __DRI2flushExtension *flush; + const __DRI2flushControlExtension *flush_control; const __DRItexBufferExtension *tex_buffer; const __DRIimageExtension *image; const __DRIrobustnessExtension *robustness; + const __DRInoErrorExtension *no_error; const __DRI2configQueryExtension *config; const __DRI2fenceExtension *fence; + const __DRI2bufferDamageExtension *buffer_damage; + const __DRI2blobExtension *blob; const __DRI2rendererQueryExtension *rendererQuery; const __DRI2interopExtension *interop; + const __DRIconfigOptionsExtension *configOptions; + const __DRImutableRenderBufferDriverExtension *mutable_render_buffer; int fd; /* dri2_initialize/dri2_terminate increment/decrement this count, so does * dri2_make_current (tracks if there are active contexts/surfaces). */ int ref_count; - int own_device; - int invalidate_available; + bool own_device; + bool invalidate_available; int min_swap_interval; int max_swap_interval; int default_swap_interval; @@ -193,8 +210,13 @@ struct dri2_egl_display #ifdef HAVE_X11_PLATFORM xcb_connection_t *conn; xcb_screen_t *screen; - int swap_available; + bool swap_available; #ifdef HAVE_DRI3 + bool multibuffers_available; + int dri3_major_version; + int dri3_minor_version; + int present_major_version; + int present_minor_version; struct loader_dri3_extensions loader_dri3_ext; #endif #endif @@ -207,8 +229,10 @@ struct dri2_egl_display 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 u_vector *wl_modifiers; + bool authenticated; + BITSET_DECLARE(formats, EGL_DRI2_MAX_FORMATS); uint32_t capabilities; char *device_name; #endif @@ -217,8 +241,8 @@ struct dri2_egl_display const gralloc_module_t *gralloc; #endif - int is_render_node; - int is_different_gpu; + bool is_render_node; + bool is_different_gpu; }; struct dri2_egl_context @@ -241,8 +265,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; @@ -257,6 +280,10 @@ 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; #endif @@ -265,11 +292,14 @@ struct dri2_egl_surface struct gbm_dri_surface *gbm_surf; #endif + /* EGL-owned buffers */ + __DRIbuffer *local_buffers[__DRI_BUFFER_COUNT]; + #if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM) - __DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT]; struct { #ifdef HAVE_WAYLAND_PLATFORM struct wl_buffer *wl_buffer; + bool wl_release; __DRIimage *dri_image; /* for is_different_gpu case. NULL else */ __DRIimage *linear_copy; @@ -280,7 +310,7 @@ struct dri2_egl_surface #ifdef HAVE_DRM_PLATFORM struct gbm_bo *bo; #endif - int locked; + bool locked; int age; } color_buffers[4], *back, *current; #endif @@ -291,30 +321,32 @@ struct dri2_egl_surface __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. + * Allocate number of color_buffers based on query to android bufferqueue + * and save color_buffers_count. */ + int color_buffers_count; struct { struct ANativeWindowBuffer *buffer; int age; - } color_buffers[3], *back; + } *color_buffers, *back; #endif -#if defined(HAVE_SURFACELESS_PLATFORM) - __DRIimage *front; - unsigned int visual; -#endif + /* surfaceless and device */ + __DRIimage *front; + unsigned int visual; + + int out_fence_fd; + EGLBoolean enable_out_fence; + + /* swrast device */ + char *swrast_device_buffer; }; struct dri2_egl_config { _EGLConfig base; - const __DRIconfig *dri_single_config[2]; - const __DRIconfig *dri_double_config[2]; + const __DRIconfig *dri_config[2][2]; }; struct dri2_egl_image @@ -345,6 +377,7 @@ _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; +extern const __DRIswrastLoaderExtension swrast_pbuffer_loader_extension; EGLBoolean dri2_load_driver(_EGLDisplay *disp); @@ -353,6 +386,9 @@ 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); @@ -362,16 +398,29 @@ 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); +void +dri2_get_shifts_and_sizes(const __DRIcoreExtension *core, + const __DRIconfig *config, int *shifts, + unsigned int *sizes); + +void +dri2_get_render_type_float(const __DRIcoreExtension *core, + const __DRIconfig *config, + bool *is_float); + 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); + const int *rgba_shifts, const unsigned int *rgba_sizes); _EGLImage * dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, @@ -382,20 +431,86 @@ _EGLImage * dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, EGLClientBuffer buffer, const EGLint *attr_list); +#ifdef HAVE_X11_PLATFORM EGLBoolean dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp); +void +dri2_teardown_x11(struct dri2_egl_display *dri2_dpy); +unsigned int +dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth); +#else +static inline EGLBoolean +dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp) +{ + return _eglError(EGL_NOT_INITIALIZED, "X11 platform not built"); +} +static inline void +dri2_teardown_x11(struct dri2_egl_display *dri2_dpy) {} +static inline unsigned int +dri2_x11_get_red_mask_for_depth(struct dri2_egl_display *dri2_dpy, int depth) +{ + return 0; +} +#endif +#ifdef HAVE_DRM_PLATFORM EGLBoolean dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp); +void +dri2_teardown_drm(struct dri2_egl_display *dri2_dpy); +#else +static inline EGLBoolean +dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) +{ + return _eglError(EGL_NOT_INITIALIZED, "GBM/DRM platform not built"); +} +static inline void +dri2_teardown_drm(struct dri2_egl_display *dri2_dpy) {} +#endif +#ifdef HAVE_WAYLAND_PLATFORM EGLBoolean dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp); +void +dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy); +bool +dri2_wl_is_format_supported(void* user_data, uint32_t format); +#else +static inline EGLBoolean +dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) +{ + return _eglError(EGL_NOT_INITIALIZED, "Wayland platform not built"); +} +static inline void +dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy) {} +#endif +#ifdef HAVE_ANDROID_PLATFORM EGLBoolean dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp); +#else +static inline EGLBoolean +dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp) +{ + return _eglError(EGL_NOT_INITIALIZED, "Android platform not built"); +} +#endif +#ifdef HAVE_SURFACELESS_PLATFORM EGLBoolean dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp); +#else +static inline EGLBoolean +dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp) +{ + return _eglError(EGL_NOT_INITIALIZED, "Surfaceless platform not built"); +} +#endif + +EGLBoolean +dri2_initialize_device(_EGLDriver *drv, _EGLDisplay *disp); +static inline void +dri2_teardown_device(struct dri2_egl_display *dri2_dpy) { /* noop */ } void dri2_flush_drawable_for_swapbuffers(_EGLDisplay *disp, _EGLSurface *draw); @@ -428,4 +543,34 @@ dri2_set_WL_bind_wayland_display(_EGLDriver *drv, _EGLDisplay *disp) #endif } +void +dri2_display_destroy(_EGLDisplay *disp); + +__DRIbuffer * +dri2_egl_surface_alloc_local_buffer(struct dri2_egl_surface *dri2_surf, + unsigned int att, unsigned int format); + +void +dri2_egl_surface_free_local_buffers(struct dri2_egl_surface *dri2_surf); + +EGLBoolean +dri2_init_surface(_EGLSurface *surf, _EGLDisplay *disp, EGLint type, + _EGLConfig *conf, const EGLint *attrib_list, + EGLBoolean enable_out_fence, void *native_surface); + +void +dri2_fini_surface(_EGLSurface *surf); + +EGLBoolean +dri2_create_drawable(struct dri2_egl_display *dri2_dpy, + const __DRIconfig *config, + struct dri2_egl_surface *dri2_surf, + void *loaderPrivate); + +static inline uint64_t +combine_u32_into_u64(uint32_t hi, uint32_t lo) +{ + return (((uint64_t) hi) << 32) | (((uint64_t) lo) & 0xffffffff); +} + #endif /* EGL_DRI2_INCLUDED */