mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clients: Fix typos 

And forgotten display_create conversion in view.c.
This commit is contained in:
Benjamin Franzke 2011-09-01 10:36:16 +02:00
parent 11568a73ba
commit 4b87a13974
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/view.c
View File

@ -278,7 +278,7 @@ main(int argc, char *argv[])
struct display *d; struct display *d;
int i; int i;
d = display_create(&argc, &argv, option_entries, NULL); d = display_create(&argc, &argv, option_entries);
if (d == NULL) { if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n"); fprintf(stderr, "failed to create display: %m\n");
return -1; return -1;

9
clients/window.c
View File

@ -66,7 +66,7 @@ struct display {
int authenticated; int authenticated;
EGLDisplay dpy; EGLDisplay dpy;
EGLConfig rgb_config; EGLConfig rgb_config;
EGLConfig premul_argb_config; EGLConfig premultiplied_argb_config;
EGLContext ctx; EGLContext ctx;
cairo_device_t *device; cairo_device_t *device;
int fd; int fd;
@ -233,7 +233,7 @@ display_create_egl_window_surface(struct display *display,
if (flags & SURFACE_OPAQUE) { if (flags & SURFACE_OPAQUE) {
config = display->rgb_config; config = display->rgb_config;
attribps = NULL; attribs = NULL;
} else { } else {
config = display->premultiplied_argb_config; config = display->premultiplied_argb_config;
attribs = premul_attribs; attribs = premul_attribs;
@ -393,8 +393,7 @@ display_create_egl_image_surface_from_file(struct display *display,
} }
} }
visual = display->premultiplied_argb_visual; surface = display_create_egl_image_surface(display, 0, rect);
surface = display_create_egl_image_surface(display, visual, rect);
if (surface == NULL) { if (surface == NULL) {
g_object_unref(pixbuf); g_object_unref(pixbuf);
return NULL; return NULL;
@ -1864,7 +1863,7 @@ init_egl(struct display *d)
} }
if (!eglChooseConfig(d->dpy, premul_argb_cfg_attribs, if (!eglChooseConfig(d->dpy, premul_argb_cfg_attribs,
&d->premul_argb_config, 1, &n) || n != 1) { &d->premultiplied_argb_config, 1, &n) || n != 1) {
fprintf(stderr, "failed to choose premul argb config\n"); fprintf(stderr, "failed to choose premul argb config\n");
return -1; return -1;
} }