glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_glext.h  |    3 +++
 src/glamor_pixmap.c |    2 +-
 src/glamor_priv.h   |    2 --
 src/glamor_render.c |    4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit e51e16e64b1b87a6eb96c5993183475ad8a88cfd
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date:   Fri Jul 13 09:20:02 2012 +0800

    gles2: Fixed the compilation problem and some bugs.
    
    Previous patch doesn't set the offset to zero for GLESv2
    path. Now fix it.
    
    This patch also fix a minor problem in pixmap uploading
    preparation. If the revert is not REVERT_NORMAL, then we
    don't need to prepare a fbo for it. As current mesa i965
    gles2 driver doesn't support to set a A8 texture as a fbo
    target, we must fix this problem. As some A1/A8 picture
    need to be uploaded, this is the only place a A8 texture
    may be attached to a fbo.
    
    This patch also enable the shader gradient for GLESv2.
    The reason we disable it before is that some glsl linker
    doesn't support link different objects which have cross
    reference. Now we don't have that problem.
    
    Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>