glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_copyarea.c |    5 +++--
 src/glamor_render.c   |   16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 2ac2fc0de978ba7076ba7c5e3c34caec05939dde
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Jan 15 16:32:10 2014 +0900

    Fix memory leak in _glamor_copy_n_to_n()
    
    It would leak the memory allocated for the region rects in some cases.
    Found with valgrind.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>

commit 580aa0524a99ce80d3f556de4aa1a10b1f7f8de4
Author: Anthony Waters <awaters1 at gmail.com>
Date:   Wed Jan 15 16:17:08 2014 -0500

    glamor: Fix coordinates handling for composite source/mask pictures
    
    There were actually two issues with the original code I believe, the
    first is that the call to glamor_convert_gradient_picture wasn't
    properly referencing the coordinates of the source/mask pictures.  The
    second, was that the updated references (x_temp/y_temp) were also
    improperly set, they should always be 0 because the temp pictures are
    new ones that start at (0, 0).  The reason it worked in certain cases
    and it didn't in others (notably the tray icons) was due to the
    numbers working out based on the call to glamor_composite.  In the
    cases that it did work extent->x1 would equal x_dest and extent->y1
    would equal y_dest, making it so what was actually passed into
    glamor_convert_gradient_picture and the settings for x_temp/y_temp
    were correct.  However, for the case when extent->x1 wouldn't equal
    x_dest and extent->y1 wouldn't equal y_dest (for example with the tray
    icons) then the wrong parameters get passed into
    glamor_convert_gradient_picture and x_temp/y_temp are set improperly.
    
    Fixes issues with tray icons not appearing properly in certain cases.
    
    Bug:
    https://bugs.freedesktop.org/show_bug.cgi?id=64738
    
    Signed-Off-by: Anthony Waters <awaters1 at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>