glx: Clean up the clip area conditions

Move the size check after the NULL check, add the clip height into the
check logic and fix up the comment.

http://bugzilla.openedhand.com/show_bug.cgi?id=2040

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Owen W. Taylor 2010-03-19 18:18:17 +00:00 committed by Emmanuele Bassi
parent f935270aa0
commit 2fc8ecdb92

View File

@ -377,11 +377,6 @@ clutter_stage_glx_add_redraw_clip (ClutterStageWindow *stage_window,
if (clutter_stage_glx_ignoring_redraw_clips (stage_window))
return;
/* Do nothing on an empty clip, to avoid confusing with the flag degenerate
* clip */
if (stage_clip != NULL && stage_clip->width == 0)
return;
/* A NULL stage clip means a full stage redraw has been queued and
* we keep track of this by setting a degenerate
* stage_glx->bounding_redraw_clip */
@ -391,6 +386,12 @@ clutter_stage_glx_add_redraw_clip (ClutterStageWindow *stage_window,
return;
}
/* Do nothing on an empty clip to avoid confusing with out magic-flag
* degenerate clip
*/
if (stage_clip->width == 0 || stage_clip->height == 0)
return;
if (!stage_glx->initialized_redraw_clip)
{
stage_glx->bounding_redraw_clip.x = stage_clip->x;