mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-19 06:47:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pass' into 'master'

Browse source 
Draft: render: refactor render_pass

See merge request wlroots/wlroots!5292
This commit is contained in:
YaoBing Xiao 2026-04-10 14:02:23 +08:00
commit 9a60741a89
32 changed files with 1950 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

99
include/wlr/render/interface.h
View file

@ -48,21 +48,22 @@ struct wlr_texture_impl {
void wlr_texture_init(struct wlr_texture *texture, struct wlr_renderer *rendener,
const struct wlr_texture_impl *impl, uint32_t width, uint32_t height);
struct wlr_render_pass;
struct wlr_render_pass_impl {
void (*destroy)(struct wlr_render_pass *pass);
struct wlr_renderer *(*get_renderer)(struct wlr_render_pass *pass);
};
struct wlr_render_pass {
const struct wlr_render_pass_impl *impl;
};
void wlr_render_pass_init(struct wlr_render_pass *pass,
const struct wlr_render_pass_impl *impl);
struct wlr_render_pass_impl {
bool (*submit)(struct wlr_render_pass *pass);
void (*add_texture)(struct wlr_render_pass *pass,
const struct wlr_render_texture_options *options);
/* Implementers are also guaranteed that options->box is nonempty */
void (*add_rect)(struct wlr_render_pass *pass,
const struct wlr_render_rect_options *options);
};
void wlr_render_pass_destroy(struct wlr_render_pass *pass);
struct wlr_renderer *wlr_get_wlr_renderer_from_render_pass(
struct wlr_render_pass *wlr_pass);
struct wlr_render_timer {
const struct wlr_render_timer_impl *impl;
@ -87,4 +88,84 @@ void wlr_texture_read_pixels_options_get_src_box(
void *wlr_texture_read_pixel_options_get_data(
const struct wlr_texture_read_pixels_options *options);
struct wlr_render_rect_pass;
struct wlr_render_rect_pass_impl {
void (*destroy)(struct wlr_render_rect_pass *pass);
void (*render)(struct wlr_render_pass *pass,
const struct wlr_render_rect_options *options);
};
struct wlr_render_rect_pass {
const struct wlr_render_rect_pass_impl *impl;
struct {
struct wl_signal destroy;
} events;
};
void wlr_render_rect_pass_init(struct wlr_render_rect_pass *pass,
const struct wlr_render_rect_pass_impl *impl);
void wlr_render_rect_pass_destroy(struct wlr_render_rect_pass *pass);
struct wlr_render_rect_pass *get_or_create_render_rect_pass(
struct wlr_renderer *renderer);
struct wlr_render_rect_pass *wlr_pixman_render_rect_pass_create(void);
struct wlr_render_rect_pass *wlr_gles2_render_rect_pass_create(
struct wlr_renderer *wlr_renderer);
struct wlr_render_rect_pass *wlr_vk_render_rect_pass_create(
struct wlr_renderer *wlr_renderer);
struct wlr_render_texture_pass;
struct wlr_render_texture_pass_impl {
void (*destroy)(struct wlr_render_texture_pass *pass);
void (*render)(struct wlr_render_pass *pass,
const struct wlr_render_texture_options *options);
};
struct wlr_render_texture_pass {
const struct wlr_render_texture_pass_impl *impl;
struct {
struct wl_signal destroy;
} events;
};
void wlr_render_texture_pass_init(struct wlr_render_texture_pass *pass,
const struct wlr_render_texture_pass_impl *impl);
void wlr_render_texture_pass_destroy(struct wlr_render_texture_pass *pass);
struct wlr_render_texture_pass *get_or_create_render_texture_pass(
struct wlr_renderer *renderer);
struct wlr_render_texture_pass *wlr_pixman_render_texture_pass_create(void);
struct wlr_render_texture_pass *wlr_gles2_render_texture_pass_create(
struct wlr_renderer *wlr_renderer);
struct wlr_render_texture_pass *wlr_vk_render_texture_pass_create(
struct wlr_renderer *wlr_renderer);
struct wlr_render_submit_pass;
struct wlr_render_submit_pass_impl {
void (*destroy)(struct wlr_render_submit_pass *pass);
bool (*render)(struct wlr_render_pass *pass);
};
struct wlr_render_submit_pass {
const struct wlr_render_submit_pass_impl *impl;
struct {
struct wl_signal destroy;
} events;
};
void wlr_render_submit_pass_init(struct wlr_render_submit_pass *pass,
const struct wlr_render_submit_pass_impl *impl);
void wlr_render_submit_pass_destroy(struct wlr_render_submit_pass *pass);
struct wlr_render_submit_pass *get_or_create_render_submit_pass(
struct wlr_renderer *renderer);
struct wlr_render_submit_pass *wlr_pixman_render_submit_pass_create(void);
struct wlr_render_submit_pass *wlr_gles2_render_submit_pass_create(void);
struct wlr_render_submit_pass *wlr_vk_render_submit_pass_create(
struct wlr_renderer *wlr_renderer);
struct wlr_vk_render_pass *wlr_vk_render_pass_from_render_pass(
struct wlr_render_pass *wlr_pass);
#endif

5
include/wlr/render/wlr_renderer.h
View file

@ -26,6 +26,11 @@ struct wlr_fbox;
* A renderer for basic 2D operations.
*/
struct wlr_renderer {
struct wlr_render_rect_pass *rect_pass;
struct wlr_render_texture_pass *texture_pass;
struct wlr_render_submit_pass *submit_pass;
void *data;
// Capabilities required for the buffer used as a render target (bitmask of
// enum wlr_buffer_cap)
uint32_t render_buffer_caps;

2
include/wlr/types/wlr_output.h
View file

@ -250,6 +250,8 @@ struct wlr_output {
struct wl_signal description;
struct wl_signal request_state; // struct wlr_output_event_request_state
struct wl_signal destroy;
// Emitted when the output's rendering subsystem is initialized or reinitialized
struct wl_signal render_inited;
} events;
struct wl_event_source *idle_frame;