glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_pixmap.c   |   20 ++++++--------------
 src/glamor_putimage.c |    2 --
 2 files changed, 6 insertions(+), 16 deletions(-)

New commits:
commit f7304af17c0e1bf6d1904e52ca9f45ba2ec5edd9
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date:   Sat Apr 14 22:40:48 2012 +0800

    Don't need to set GL_PACK_ROW_LENGTH/GL_UNPACK_ROW_LENGTH.
    
    We already adjust the stride of the pixmap, and keep the alignment
    as 4 should be ok to let the GL/GLES match the stride.
    
    Previous version has a unbalanced PACK ROW length seting, and is
    buggy, now fixed it.
    
    Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>