mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-23 06:59:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move buffer creation and buffer details into drm.c and shm.c

Browse source
This commit is contained in:
Kristian Høgsberg 2011-01-14 16:20:21 -05:00
parent e4762a6ac1
commit 8525a50362
7 changed files with 118 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compositor/compositor.h
View file

@ -77,21 +77,10 @@ struct wlsc_drm {
char *filename;
};
struct wlsc_drm_buffer {
struct wl_buffer buffer;
EGLImageKHR image;
};
struct wlsc_shm {
struct wl_object object;
};
struct wlsc_shm_buffer {
struct wl_buffer buffer;
int32_t stride;
void *data;
};
struct wlsc_compositor {
struct wl_compositor compositor;
@ -101,7 +90,7 @@ struct wlsc_compositor {
EGLContext context;
GLuint fbo, vbo;
GLuint proj_uniform, tex_uniform;
struct wlsc_drm_buffer **pointer_buffers;
struct wl_buffer **pointer_buffers;
struct wl_display *wl_display;
/* We implement the shell interface. */
@ -125,6 +114,10 @@ struct wlsc_compositor {
void (*destroy)(struct wlsc_compositor *ec);
int (*authenticate)(struct wlsc_compositor *c, uint32_t id);
void (*present)(struct wlsc_compositor *c);
struct wl_buffer *(*create_buffer)(struct wlsc_compositor *c,
int32_t width, int32_t height,
struct wl_visual *visual,
const void *data);
};
#define MODIFIER_CTRL (1 << 8)
@ -163,9 +156,10 @@ wlsc_compositor_finish_frame(struct wlsc_compositor *compositor, int msecs);
void
wlsc_compositor_schedule_repaint(struct wlsc_compositor *compositor);
struct wlsc_drm_buffer *
struct wl_buffer *
wlsc_drm_buffer_create(struct wlsc_compositor *ec,
int width, int height, struct wl_visual *visual);
int width, int height,
struct wl_visual *visual, const void *data);
int
wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display);