diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 9acc846687b..02e218bcb8e 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -177,22 +177,22 @@ struct dri2_egl_display { const struct dri2_egl_display_vtbl *vtbl; - int dri2_major; - int dri2_minor; - __DRIscreen *dri_screen; - bool own_dri_screen; - const __DRIconfig **driver_configs; - void *driver; - const __DRIcoreExtension *core; + int dri2_major; + int dri2_minor; + __DRIscreen *dri_screen; + bool own_dri_screen; + const __DRIconfig **driver_configs; + void *driver; + const __DRIcoreExtension *core; const __DRIimageDriverExtension *image_driver; - const __DRIdri2Extension *dri2; - const __DRIswrastExtension *swrast; - const __DRI2flushExtension *flush; + const __DRIdri2Extension *dri2; + const __DRIswrastExtension *swrast; + const __DRI2flushExtension *flush; const __DRI2flushControlExtension *flush_control; - const __DRItexBufferExtension *tex_buffer; - const __DRIimageExtension *image; + const __DRItexBufferExtension *tex_buffer; + const __DRIimageExtension *image; const __DRIrobustnessExtension *robustness; - const __DRInoErrorExtension *no_error; + const __DRInoErrorExtension *no_error; const __DRI2configQueryExtension *config; const __DRI2fenceExtension *fence; const __DRI2bufferDamageExtension *buffer_damage; @@ -201,54 +201,54 @@ struct dri2_egl_display const __DRI2interopExtension *interop; const __DRIconfigOptionsExtension *configOptions; const __DRImutableRenderBufferDriverExtension *mutable_render_buffer; - int fd; + 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 ref_count; - bool own_device; - bool invalidate_available; - int min_swap_interval; - int max_swap_interval; - int default_swap_interval; + bool own_device; + bool invalidate_available; + int min_swap_interval; + int max_swap_interval; + int default_swap_interval; #ifdef HAVE_DRM_PLATFORM - struct gbm_dri_device *gbm_dri; + struct gbm_dri_device *gbm_dri; #endif - char *driver_name; + char *driver_name; - const __DRIextension **loader_extensions; - const __DRIextension **driver_extensions; + const __DRIextension **loader_extensions; + const __DRIextension **driver_extensions; #ifdef HAVE_X11_PLATFORM - xcb_connection_t *conn; - xcb_screen_t *screen; - bool swap_available; + xcb_connection_t *conn; + xcb_screen_t *screen; + 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; + 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 #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; + 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; struct zwp_linux_dmabuf_v1 *wl_dmabuf; - struct u_vector *wl_modifiers; - bool authenticated; + struct u_vector *wl_modifiers; + bool authenticated; BITSET_DECLARE(formats, EGL_DRI2_MAX_FORMATS); - uint32_t capabilities; - char *device_name; + uint32_t capabilities; + char *device_name; #endif #ifdef HAVE_ANDROID_PLATFORM @@ -257,13 +257,13 @@ struct dri2_egl_display uint32_t front_rendering_usage; #endif - bool is_render_node; - bool is_different_gpu; + bool is_render_node; + bool is_different_gpu; }; struct dri2_egl_context { - _EGLContext base; + _EGLContext base; __DRIcontext *dri_context; }; @@ -278,31 +278,31 @@ enum wayland_buffer_type { struct dri2_egl_surface { - _EGLSurface base; - __DRIdrawable *dri_drawable; - __DRIbuffer buffers[5]; - bool have_fake_front; + _EGLSurface base; + __DRIdrawable *dri_drawable; + __DRIbuffer buffers[5]; + bool have_fake_front; #ifdef HAVE_X11_PLATFORM - xcb_drawable_t drawable; - xcb_xfixes_region_t region; - int depth; - int bytes_per_pixel; - xcb_gcontext_t gc; - xcb_gcontext_t swapgc; + xcb_drawable_t drawable; + xcb_xfixes_region_t region; + int depth; + int bytes_per_pixel; + xcb_gcontext_t gc; + xcb_gcontext_t swapgc; #endif #ifdef HAVE_WAYLAND_PLATFORM - struct wl_egl_window *wl_win; - int dx; - int dy; + 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; - bool resized; + 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; + bool resized; #endif #ifdef HAVE_DRM_PLATFORM @@ -310,25 +310,25 @@ struct dri2_egl_surface #endif /* EGL-owned buffers */ - __DRIbuffer *local_buffers[__DRI_BUFFER_COUNT]; + __DRIbuffer *local_buffers[__DRI_BUFFER_COUNT]; #if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM) struct { #ifdef HAVE_WAYLAND_PLATFORM - struct wl_buffer *wl_buffer; - bool wl_release; - __DRIimage *dri_image; + struct wl_buffer *wl_buffer; + bool wl_release; + __DRIimage *dri_image; /* for is_different_gpu case. NULL else */ - __DRIimage *linear_copy; + __DRIimage *linear_copy; /* for swrast */ void *data; int data_size; #endif #ifdef HAVE_DRM_PLATFORM - struct gbm_bo *bo; + struct gbm_bo *bo; #endif - bool locked; - int age; + bool locked; + int age; } color_buffers[4], *back, *current; #endif @@ -351,8 +351,8 @@ struct dri2_egl_surface #endif /* surfaceless and device */ - __DRIimage *front; - unsigned int visual; + __DRIimage *front; + unsigned int visual; int out_fence_fd; EGLBoolean enable_out_fence; @@ -363,13 +363,13 @@ struct dri2_egl_surface struct dri2_egl_config { - _EGLConfig base; + _EGLConfig base; const __DRIconfig *dri_config[2][2]; }; struct dri2_egl_image { - _EGLImage base; + _EGLImage base; __DRIimage *dri_image; };