Merge branch 'github/fork/emersion/renderer-get-texture-formats' into 'master'

render: unify texture format enumeration

See merge request wlroots/wlroots!3112
This commit is contained in:
Simon Ser 2022-05-24 20:46:32 +00:00
commit 43b4f9e446
12 changed files with 55 additions and 74 deletions

View file

@ -76,6 +76,8 @@ struct wlr_gles2_renderer {
struct wlr_gles2_buffer *current_buffer;
uint32_t viewport_width, viewport_height;
struct wlr_drm_format_set data_ptr_texture_formats;
};
struct wlr_gles2_buffer {
@ -118,8 +120,7 @@ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
const struct wlr_gles2_pixel_format *get_gles2_format_from_drm(uint32_t fmt);
const struct wlr_gles2_pixel_format *get_gles2_format_from_gl(
GLint gl_format, GLint gl_type, bool alpha);
const uint32_t *get_gles2_shm_formats(const struct wlr_gles2_renderer *renderer,
size_t *len);
void init_gles2_data_ptr_formats(struct wlr_gles2_renderer *renderer);
struct wlr_gles2_renderer *gles2_get_renderer(
struct wlr_renderer *wlr_renderer);

View file

@ -50,6 +50,6 @@ struct wlr_pixman_texture {
pixman_format_code_t get_pixman_format_from_drm(uint32_t fmt);
uint32_t get_drm_format_from_pixman(pixman_format_code_t fmt);
const uint32_t *get_pixman_drm_formats(size_t *len);
void init_pixman_formats(struct wlr_pixman_renderer *renderer);
#endif