mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to track the cairo_drm_device_t rename

Browse Source
This commit is contained in:
Kristian Høgsberg
2009-05-28 20:23:31 -04:00
parent cda0e0db98
commit 2644910241
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flower.c
+4 -3
View File
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
struct wl_display *display; struct wl_display *display;
struct wl_visual *visual; struct wl_visual *visual;
int fd; int fd;
cairo_drm_context_t *ctx; cairo_drm_device_t *device;
cairo_surface_t *s; cairo_surface_t *s;
struct timespec ts; struct timespec ts;
GMainLoop *loop; GMainLoop *loop;
@@ -171,8 +171,9 @@ int main(int argc, char *argv[])
srandom(ts.tv_nsec); srandom(ts.tv_nsec);
flower.offset = random(); flower.offset = random();
ctx = cairo_drm_context_get_for_fd(fd); device = cairo_drm_device_get_for_fd(fd);
s = cairo_drm_surface_create(ctx, CAIRO_CONTENT_COLOR_ALPHA, s = cairo_drm_surface_create(device,
CAIRO_CONTENT_COLOR_ALPHA,
flower.width, flower.height); flower.width, flower.height);
draw_stuff(s, flower.width, flower.height); draw_stuff(s, flower.width, flower.height);
window.c
+7 -7
View File
@@ -46,7 +46,7 @@ struct display {
struct wl_output *output; struct wl_output *output;
struct wl_input_device *input_device; struct wl_input_device *input_device;
struct rectangle screen_allocation; struct rectangle screen_allocation;
cairo_drm_context_t *ctx; cairo_drm_device_t *device;
int fd; int fd;
}; };
@@ -98,7 +98,7 @@ window_draw_decorations(struct window *window)
int width, height; int width, height;
window->cairo_surface = window->cairo_surface =
cairo_drm_surface_create(window->display->ctx, cairo_drm_surface_create(window->display->device,
CAIRO_CONTENT_COLOR_ALPHA, CAIRO_CONTENT_COLOR_ALPHA,
window->allocation.width, window->allocation.width,
window->allocation.height); window->allocation.height);
@@ -205,7 +205,7 @@ window_draw_fullscreen(struct window *window)
struct wl_visual *visual; struct wl_visual *visual;
window->cairo_surface = window->cairo_surface =
cairo_drm_surface_create(window->display->ctx, cairo_drm_surface_create(window->display->device,
CAIRO_CONTENT_COLOR_ALPHA, CAIRO_CONTENT_COLOR_ALPHA,
window->allocation.width, window->allocation.width,
window->allocation.height); window->allocation.height);
@@ -562,7 +562,7 @@ cairo_surface_t *
window_create_surface(struct window *window, window_create_surface(struct window *window,
struct rectangle *rectangle) struct rectangle *rectangle)
{ {
return cairo_drm_surface_create(window->display->ctx, return cairo_drm_surface_create(window->display->device,
CAIRO_CONTENT_COLOR_ALPHA, CAIRO_CONTENT_COLOR_ALPHA,
rectangle->width, rectangle->width,
rectangle->height); rectangle->height);
@@ -707,9 +707,9 @@ display_create(struct wl_display *display, int fd)
return NULL; return NULL;
d->display = display; d->display = display;
d->ctx = cairo_drm_context_get_for_fd(fd); d->device = cairo_drm_device_get_for_fd(fd);
if (d->ctx == NULL) { if (d->device == NULL) {
fprintf(stderr, "failed to get cairo drm context\n"); fprintf(stderr, "failed to get cairo drm device\n");
return NULL; return NULL;
} }