isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-29 06:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[main] Use cogl_read_pixels not glReadPixels in clutter-main.c

Browse Source 
The debugging function read_pixels_to_file() and _clutter_do_pick were both
directly calling glReadPixels, but we don't wan't Clutter making direct
OpenGL calls and Cogl provides a suitable alternative.  It also means
read_pixels_to_file() doesn't need to manually flip the data read due to
differences in Clutter/Cogl coordinate systems.
This commit is contained in:
Robert Bragg 2009-10-30 23:54:13 +00:00
parent 40b8399d49
commit b2ebb7db48
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clutter/clutter-main.c
View File

@ -425,10 +425,12 @@ read_pixels_to_file (char *filename_stem,
GLubyte *data; GLubyte *data;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
static int read_count = 0; static int read_count = 0;
GdkPixbuf *flipped;
data = g_malloc (4 * width * height); data = g_malloc (4 * width * height);
glReadPixels (0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, data); cogl_read_pixels (x, y, width, height,
COGL_READ_PIXELS_COLOR_BUFFER,
COGL_PIXEL_FORMAT_RGBA_8888,
data);
pixbuf = gdk_pixbuf_new_from_data (data, pixbuf = gdk_pixbuf_new_from_data (data,
GDK_COLORSPACE_RGB, GDK_COLORSPACE_RGB,
TRUE, /* has alpha */ TRUE, /* has alpha */
@ -439,24 +441,18 @@ read_pixels_to_file (char *filename_stem,
pixbuf_free, /* callback to free data */ pixbuf_free, /* callback to free data */
NULL); /* callback data */ NULL); /* callback data */
if (pixbuf) if (pixbuf)
{
flipped = gdk_pixbuf_flip (pixbuf, FALSE);
g_object_unref (pixbuf);
}
if (flipped)
{ {
char *filename = char *filename =
g_strdup_printf ("%s-%05d.png", filename_stem, read_count); g_strdup_printf ("%s-%05d.png", filename_stem, read_count);
GError *error = NULL; GError *error = NULL;
if (!gdk_pixbuf_save (flipped, filename, "png", &error, NULL)) if (!gdk_pixbuf_save (pixbuf, filename, "png", &error, NULL))
{ {
g_warning ("Failed to save pick buffer to file %s: %s", g_warning ("Failed to save pick buffer to file %s: %s",
filename, error->message); filename, error->message);
g_error_free (error); g_error_free (error);
} }
g_free (filename); g_free (filename);
g_object_unref (flipped); g_object_unref (pixbuf);
read_count++; read_count++;
} }
#else #else
@ -478,7 +474,6 @@ _clutter_do_pick (ClutterStage *stage,
{ {
ClutterMainContext *context; ClutterMainContext *context;
guchar pixel[4] = { 0xff, 0xff, 0xff, 0xff }; guchar pixel[4] = { 0xff, 0xff, 0xff, 0xff };
GLint viewport[4];
CoglColor white; CoglColor white;
guint32 id; guint32 id;
GLboolean dither_was_on; GLboolean dither_was_on;
@ -517,17 +512,21 @@ _clutter_do_pick (ClutterStage *stage,
if (G_LIKELY (!(clutter_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS))) if (G_LIKELY (!(clutter_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
cogl_clip_pop (); cogl_clip_pop ();
/* Calls should work under both GL and GLES, note GLES needs RGBA */
glGetIntegerv(GL_VIEWPORT, viewport);
/* Make sure Cogl flushes any batched geometry to the GPU driver */ /* Make sure Cogl flushes any batched geometry to the GPU driver */
cogl_flush (); cogl_flush ();
/* Read the color of the screen co-ords pixel */ /* Read the color of the screen co-ords pixel */
glReadPixels (x, viewport[3] - y -1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); cogl_read_pixels (x, y, 1, 1,
COGL_READ_PIXELS_COLOR_BUFFER,
COGL_PIXEL_FORMAT_RGBA_8888,
pixel);
if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)) if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS))
read_pixels_to_file ("pick-buffer", 0, 0, viewport[2], viewport[3]); {
read_pixels_to_file ("pick-buffer", 0, 0,
clutter_actor_get_width (CLUTTER_ACTOR (stage)),
clutter_actor_get_height (CLUTTER_ACTOR (stage)));
}
/* Restore whether GL_DITHER was enabled */ /* Restore whether GL_DITHER was enabled */
if (dither_was_on) if (dither_was_on)