X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fdrivers%2Fdri2%2Fegl_dri2.h;h=2fc3752a7838e5593a836a696cbcddd041c96720;hb=2ef983dca61b549a9242afd9008200b231a26e90;hp=4abe1ba1952f719d7dd2e03074a223b5fa6078c1;hpb=00992700c9a812a545637ec409099682ca9cc79a;p=mesa.git diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 4abe1ba1952..2fc3752a783 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -81,69 +81,68 @@ struct zwp_linux_dmabuf_v1; #include "eglsync.h" #include "util/u_vector.h" +#include "util/bitset.h" + +#define EGL_DRI2_MAX_FORMATS 10 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 (*set_damage_region)(_EGLDriver *drv, _EGLDisplay *dpy, - _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, @@ -151,12 +150,12 @@ struct dri2_egl_display_vtbl { __DRIdrawable *(*get_dri_drawable)(_EGLSurface *surf); - void (*close_screen_notify)(_EGLDisplay *dpy); + 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 *dpy, _EGLSurface *surf, + bool (*set_shared_buffer_mode)(_EGLDisplay *disp, _EGLSurface *surf, bool mode); }; @@ -182,9 +181,11 @@ struct dri2_egl_display 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; @@ -231,7 +232,7 @@ struct dri2_egl_display struct zwp_linux_dmabuf_v1 *wl_dmabuf; struct u_vector *wl_modifiers; bool authenticated; - unsigned formats; + BITSET_DECLARE(formats, EGL_DRI2_MAX_FORMATS); uint32_t capabilities; char *device_name; #endif @@ -321,21 +322,25 @@ struct dri2_egl_surface __DRIimage *dri_image_front; /* 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 @@ -358,7 +363,7 @@ struct dri2_egl_sync { void *fence; }; -/* From xmlpool/options.h, user exposed so should be stable */ +/* From xmlpool.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 @@ -372,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); @@ -401,10 +407,27 @@ 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); + +unsigned int +dri2_image_format_for_pbuffer_config(struct dri2_egl_display *dri2_dpy, + const __DRIconfig *config); + 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); + +EGLBoolean +dri2_add_pbuffer_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp); _EGLImage * dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, @@ -457,6 +480,8 @@ 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) @@ -489,6 +514,11 @@ dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp) } #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); @@ -531,12 +561,19 @@ void dri2_egl_surface_free_local_buffers(struct dri2_egl_surface *dri2_surf); EGLBoolean -dri2_init_surface(_EGLSurface *surf, _EGLDisplay *dpy, EGLint type, - _EGLConfig *conf, const EGLint *attrib_list, EGLBoolean enable_out_fence); +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) {