isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage: don't call glGetIntegerv in clutter_stage_read_pixels

Browse Source 
Firstly Clutter shouldn't be using OpenGL directly so this needed
changing but also conceptually it doesn't make sense for
clutter_stage_read_pixels to validate the requested area to read against
the viewport it would make more sense to compare against the window
size. Finally checking that the width of the area is less than the
viewport or window width without considering the x isn't enough to know
if the area extends outside the windows bounds. (same for the height)

This patch removes the validation of the read area from
clutter_stage_read_pixels and instead we now simply rely on the
semantics of cogl_read_pixels for reading areas outside the window
bounds.
This commit is contained in:
Robert Bragg 2011-02-01 18:15:50 +00:00
parent 013b2433f0
commit 1431b77747
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clutter/clutter-stage.c
View File

@ -2186,35 +2186,24 @@ clutter_stage_read_pixels (ClutterStage *stage,
gint width, gint width,
gint height) gint height)
{ {
ClutterGeometry geom;
guchar *pixels; guchar *pixels;
GLint viewport[4];
gint rowstride;
gint stage_width, stage_height;
g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL); g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
/* according to glReadPixels documentation pixels outside the viewport are
* undefined, but no error should be provoked, thus this is probably unnneed.
*/
g_return_val_if_fail (x >= 0 && y >= 0, NULL);
/* Force a redraw of the stage before reading back pixels */ /* Force a redraw of the stage before reading back pixels */
clutter_stage_ensure_current (stage); clutter_stage_ensure_current (stage);
clutter_actor_paint (CLUTTER_ACTOR (stage)); clutter_actor_paint (CLUTTER_ACTOR (stage));
glGetIntegerv (GL_VIEWPORT, viewport); clutter_actor_get_allocation_geometry (CLUTTER_ACTOR (stage), &geom);
stage_width = viewport[2];
stage_height = viewport[3];
if (width < 0 || width > stage_width) if (width < 0)
width = stage_width; width = geom.width;
if (height < 0 || height > stage_height) if (height < 0)
height = stage_height; height = geom.height;
rowstride = width * 4; pixels = g_malloc (height * width * 4);
pixels = g_malloc (height * rowstride);
cogl_read_pixels (x, y, width, height, cogl_read_pixels (x, y, width, height,
COGL_READ_PIXELS_COLOR_BUFFER, COGL_READ_PIXELS_COLOR_BUFFER,