mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor out wlr_texture_state

Browse source
This commit is contained in:
Drew DeVault 2017-08-14 08:25:26 -04:00
parent c8c6619146
commit 94e6e6334b
5 changed files with 76 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/render/gles2.h
View file

@ -26,8 +26,9 @@ struct wlr_renderer_state {
struct wlr_egl *egl;
};
struct wlr_texture_state {
struct wlr_texture *wlr_texture;
struct wlr_gles2_texture {
struct wlr_texture wlr_texture;
struct wlr_egl *egl;
GLuint tex_id;
const struct pixel_format *pixel_format;

3
include/wlr/render.h
View file

@ -54,11 +54,10 @@ bool wlr_renderer_buffer_is_drm(struct wlr_renderer *renderer,
void wlr_renderer_destroy(struct wlr_renderer *renderer);
struct wlr_texture_impl;
struct wlr_texture_state;
struct wlr_texture {
struct wlr_texture_impl *impl;
struct wlr_texture_state *state;
bool valid;
uint32_t format;
int width, height;

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

@ -34,25 +34,26 @@ struct wlr_renderer *wlr_renderer_init(struct wlr_renderer_state *state,
struct wlr_renderer_impl *impl);
struct wlr_texture_impl {
bool (*upload_pixels)(struct wlr_texture_state *state,
bool (*upload_pixels)(struct wlr_texture *texture,
enum wl_shm_format format, int stride, int width, int height,
const unsigned char *pixels);
bool (*update_pixels)(struct wlr_texture_state *state,
bool (*update_pixels)(struct wlr_texture *texture,
enum wl_shm_format format, int stride, int x, int y,
int width, int height, const unsigned char *pixels);
bool (*upload_shm)(struct wlr_texture_state *state, uint32_t format,
bool (*upload_shm)(struct wlr_texture *texture, uint32_t format,
struct wl_shm_buffer *shm);
bool (*update_shm)(struct wlr_texture_state *surf, uint32_t format,
bool (*update_shm)(struct wlr_texture *texture, uint32_t format,
int x, int y, int width, int height, struct wl_shm_buffer *shm);
bool (*upload_drm)(struct wlr_texture_state *state,
bool (*upload_drm)(struct wlr_texture *texture,
struct wl_resource *drm_buf);
void (*get_matrix)(struct wlr_texture_state *state,
void (*get_matrix)(struct wlr_texture *state,
float (*matrix)[16], const float (*projection)[16], int x, int y);
void (*bind)(struct wlr_texture_state *state);
void (*destroy)(struct wlr_texture_state *state);
void (*bind)(struct wlr_texture *texture);
void (*destroy)(struct wlr_texture *texture);
};
struct wlr_texture *wlr_texture_init();
void wlr_texture_init(struct wlr_texture *texture,
struct wlr_texture_impl *impl);
void wlr_texture_bind(struct wlr_texture *texture);
#endif