From c24351681f672a2ce561b9cb6d73172dfc36c45c Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 10 Aug 2017 22:15:37 -0400 Subject: Refactor EGL handling --- include/backend/drm.h | 2 +- include/backend/egl.h | 73 --------------------------------------- include/backend/wayland.h | 2 +- include/render/gles2.h | 8 +++++ include/wlr/backend.h | 2 ++ include/wlr/backend/interface.h | 2 ++ include/wlr/egl.h | 75 +++++++++++++++++++++++++++++++++++++++++ include/wlr/render.h | 5 +++ include/wlr/render/gles2.h | 3 +- include/wlr/render/interface.h | 2 ++ include/wlr/types/wlr_surface.h | 1 + 11 files changed, 99 insertions(+), 76 deletions(-) delete mode 100644 include/backend/egl.h create mode 100644 include/wlr/egl.h (limited to 'include') diff --git a/include/backend/drm.h b/include/backend/drm.h index 2f724524..35265e21 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -12,9 +12,9 @@ #include #include +#include #include -#include #include #include "drm-properties.h" diff --git a/include/backend/egl.h b/include/backend/egl.h deleted file mode 100644 index b649c55b..00000000 --- a/include/backend/egl.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef WLR_BACKEND_EGL_H -#define WLR_BACKEND_EGL_H - -#include -#include -#include - -struct wlr_egl { - EGLDisplay display; - EGLConfig config; - EGLContext context; - - const char *egl_exts; - const char *gl_exts; - - struct wl_display *wl_display; -}; - -/** - * Initializes an egl context for the given platform and remote display. - * Will attempt to load all possibly required api functions. - */ -bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display); - -/** - * Frees all related egl resources, makes the context not-current and - * unbinds a bound wayland display. - */ -void wlr_egl_free(struct wlr_egl *egl); - -/** - * Binds the given display to the egl instance. - * This will allow clients to create egl surfaces from wayland ones and render to it. - */ -bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display); - -/** - * Queries information about the given (potential egl/drm) buffer, returns - * the information in value. - * Refer to eglQueryWaylandBufferWL for more information about attrib and value. - * Makes only sense when a wl_display was bound to it since otherwise there - * cannot be any egl/drm buffers. - * Will only work after a wlr_egl objct was initialized and if the needed egl extension - * is present. - */ -bool wlr_egl_query_buffer(struct wl_resource *buf, - EGLint attrib, EGLint *value); - -/** - * Returns a surface for the given native window - * The window must match the remote display the wlr_egl was created with. - */ -EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window); - -/** - * Creates an egl image from the given client buffer and attributes. - * Will only work after a wlr_egl objct was initialized and if the needed egl extension - * is present. - */ -EGLImageKHR wlr_egl_create_image(EGLenum target, EGLClientBuffer buffer, - const EGLint *attribs); - -/** - * Destroys an egl image created with the given wlr_egl. - */ -bool wlr_egl_destroy_image(EGLImageKHR image); - -/** - * Returns a string for the last error ocurred with egl. - */ -const char *egl_error(void); - -#endif diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 792bad37..e6339a23 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -4,10 +4,10 @@ #include #include #include +#include #include #include #include -#include "backend/egl.h" struct wlr_backend_state { /* local state */ diff --git a/include/render/gles2.h b/include/render/gles2.h index cb78a181..3006872c 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include @@ -19,8 +21,14 @@ struct pixel_format { GLuint *shader; }; +struct wlr_renderer_state { + struct wlr_renderer *renderer; + struct wlr_egl *egl; +}; + struct wlr_texture_state { struct wlr_texture *wlr_texture; + struct wlr_egl *egl; GLuint tex_id; const struct pixel_format *pixel_format; EGLImageKHR image; diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 3910e406..ce5b2568 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -3,6 +3,7 @@ #include #include +#include struct wlr_backend_impl; struct wlr_backend_state; @@ -22,5 +23,6 @@ struct wlr_backend { struct wlr_backend *wlr_backend_autocreate(struct wl_display *display); bool wlr_backend_init(struct wlr_backend *backend); void wlr_backend_destroy(struct wlr_backend *backend); +struct wlr_egl *wlr_backend_get_egl(struct wlr_backend *backend); #endif diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h index 15cfb6c3..e791bdcf 100644 --- a/include/wlr/backend/interface.h +++ b/include/wlr/backend/interface.h @@ -3,12 +3,14 @@ #include #include +#include struct wlr_backend_state; struct wlr_backend_impl { bool (*init)(struct wlr_backend_state *state); void (*destroy)(struct wlr_backend_state *state); + struct wlr_egl *(*get_egl)(struct wlr_backend_state *state); }; struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl, diff --git a/include/wlr/egl.h b/include/wlr/egl.h new file mode 100644 index 00000000..b37317a5 --- /dev/null +++ b/include/wlr/egl.h @@ -0,0 +1,75 @@ +#ifndef WLR_EGL_H +#define WLR_EGL_H + +#include +#include +#include + +struct wlr_egl { + EGLDisplay display; + EGLConfig config; + EGLContext context; + + PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display; + PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface; + + PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR; + PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR; + PFNEGLQUERYWAYLANDBUFFERWL eglQueryWaylandBufferWL; + PFNEGLBINDWAYLANDDISPLAYWL eglBindWaylandDisplayWL; + PFNEGLUNBINDWAYLANDDISPLAYWL eglUnbindWaylandDisplayWL; + + const char *egl_exts; + const char *gl_exts; + + struct wl_display *wl_display; +}; + +// TODO: Allocate and return a wlr_egl +/** + * Initializes an egl context for the given platform and remote display. + * Will attempt to load all possibly required api functions. + */ +bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display); + +/** + * Frees all related egl resources, makes the context not-current and + * unbinds a bound wayland display. + */ +void wlr_egl_free(struct wlr_egl *egl); + +/** + * Binds the given display to the egl instance. + * This will allow clients to create egl surfaces from wayland ones and render to it. + */ +bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display); + +/** + * Refer to the eglQueryWaylandBufferWL extension function. + */ +bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf, + EGLint attrib, EGLint *value); + +/** + * Returns a surface for the given native window + * The window must match the remote display the wlr_egl was created with. + */ +EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window); + +/** + * Creates an egl image from the given client buffer and attributes. + */ +EGLImageKHR wlr_egl_create_image(struct wlr_egl *egl, + EGLenum target, EGLClientBuffer buffer, const EGLint *attribs); + +/** + * Destroys an egl image created with the given wlr_egl. + */ +bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImageKHR image); + +/** + * Returns a string for the last error ocurred with egl. + */ +const char *egl_error(void); + +#endif diff --git a/include/wlr/render.h b/include/wlr/render.h index 47e2ff57..5e9f889e 100644 --- a/include/wlr/render.h +++ b/include/wlr/render.h @@ -43,6 +43,11 @@ void wlr_render_colored_ellipse(struct wlr_renderer *r, */ const enum wl_shm_format *wlr_renderer_get_formats( struct wlr_renderer *r, size_t *len); +/** + * Returns true if this wl_buffer is a DRM buffer. + */ +bool wlr_renderer_buffer_is_drm(struct wlr_renderer *renderer, + struct wl_resource *buffer); /** * Destroys this wlr_renderer. Textures must be destroyed separately. */ diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h index 43d4719e..b368d6e1 100644 --- a/include/wlr/render/gles2.h +++ b/include/wlr/render/gles2.h @@ -1,8 +1,9 @@ #ifndef _WLR_GLES2_RENDERER_H #define _WLR_GLES2_RENDERER_H #include +#include struct wlr_egl; -struct wlr_renderer *wlr_gles2_renderer_init(); +struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend); #endif diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 4a4b22e2..69485e21 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -25,6 +25,8 @@ struct wlr_renderer_impl { const float (*color)[4], const float (*matrix)[16]); const enum wl_shm_format *(*formats)( struct wlr_renderer_state *state, size_t *len); + bool (*buffer_is_drm)(struct wlr_renderer_state *state, + struct wl_resource *buffer); void (*destroy)(struct wlr_renderer_state *state); }; diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index c9cbeba6..94b7ff1e 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -29,6 +29,7 @@ struct wlr_surface_state { struct wlr_surface { struct wl_resource *resource; + struct wlr_renderer *renderer; struct wlr_texture *texture; struct wlr_surface_state current, pending; const char *role; // the lifetime-bound role or null -- cgit v1.2.3