diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2009-01-26 22:54:40 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2009-01-26 22:54:40 -0500 |
| commit | c0b44328d25900678bdff9b68a6760afafde5a6d (patch) | |
| tree | 22579793e731fb5abcfaadb8e0a73a7c9a7bd909 | |
| parent | f13eb147117be427858285dcbb06757c9160c0cd (diff) | |
| download | wayland-c0b44328d25900678bdff9b68a6760afafde5a6d.tar.gz wayland-c0b44328d25900678bdff9b68a6760afafde5a6d.tar.xz wayland-c0b44328d25900678bdff9b68a6760afafde5a6d.zip | |
Use glReadPixels() for the screen shooter
"Those who don't understand OpenGL are bound to reimplement it badly..."
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | wayland-system-compositor.c | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 19ad20a..a99533b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ terminal : LDLIBS += -lutil $(clients) : CFLAGS += @CLIENT_CFLAGS@ $(clients) : LDLIBS += -L. -lwayland @CLIENT_LIBS@ -lrt -install : $(libs) +install : $(libs) $(compositors) install -d @libdir@ @libdir@/pkgconfig ${udev_rules_dir} install $(libs) @libdir@ install wayland-server.pc wayland.pc @libdir@/pkgconfig diff --git a/wayland-system-compositor.c b/wayland-system-compositor.c index a8922f3..1b16b5e 100644 --- a/wayland-system-compositor.c +++ b/wayland-system-compositor.c @@ -153,9 +153,8 @@ screenshooter_shoot(struct wl_client *client, struct screenshooter *shooter) { struct egl_compositor *ec = shooter->ec; struct wlsc_output *output; - GLuint stride; char buffer[256]; - GdkPixbuf *pixbuf; + GdkPixbuf *pixbuf, *normal; GError *error = NULL; void *data; int i; @@ -164,11 +163,25 @@ screenshooter_shoot(struct wl_client *client, struct screenshooter *shooter) output = container_of(ec->output_list.next, struct wlsc_output, link); while (&output->link != &ec->output_list) { snprintf(buffer, sizeof buffer, "wayland-screenshot-%d.png", i++); - data = eglReadBuffer(ec->display, output->surface, GL_FRONT_LEFT, &stride); + data = malloc(output->width * output->height * 4); + if (data == NULL) { + fprintf(stderr, "couldn't allocate image buffer\n"); + continue; + } + + glReadBuffer(GL_FRONT); + glPixelStorei(GL_PACK_ALIGNMENT, 1); + glReadPixels(0, 0, output->width, output->height, + GL_RGBA, GL_UNSIGNED_BYTE, data); + pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, - 8, output->width, output->height, stride, + 8, output->width, output->height, output->width * 4, NULL, NULL); - gdk_pixbuf_save(pixbuf, buffer, "png", &error, NULL); + normal = gdk_pixbuf_flip(pixbuf, FALSE); + gdk_pixbuf_save(normal, buffer, "png", &error, NULL); + gdk_pixbuf_unref(normal); + gdk_pixbuf_unref(pixbuf); + free(data); output = container_of(output->link.next, struct wlsc_output, link); @@ -788,6 +801,7 @@ init_egl(struct egl_compositor *ec, struct udev_device *device) EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 0, EGL_CONFIG_CAVEAT, EGL_NONE, + EGL_RED_SIZE, 8, EGL_NONE }; |