glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_glyphs.c    |    3 +
 src/glamor_priv.h      |    2 
 src/glamor_trapezoid.c |  104 ++++++++++++++++++++++++++++++++++---------------
 3 files changed, 78 insertions(+), 31 deletions(-)

New commits:
commit 801192caf1444d50d905de9c6133abe7de869894
Author: Junyan He <junyan.he at linux.intel.com>
Date:   Tue Aug 7 05:01:59 2012 +0800

    Fallback to pixman when trapezoid mask is big.
    
     The trapezoid generating speed of the shader is relatively
     slower when the trapezoid area is big. We fallback when
     the trapezoid's width and height is bigger enough.
     The big traps number will also slow down the render because
     of the VBO size. We fallback if ntrap > 256
    
    Signed-off-by: Junyan He <junyan.he at linux.intel.com>
    Reviewed-By: Zhigang Gong <zhigang.gong at linux.intel.com>

commit ded419455c67846d75944c75d623d6e1c510db9f
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date:   Thu Aug 2 18:07:07 2012 +0800

    glamor_glyphs: When dst arg point to a NULL buffer, dont't flush.
    
    This is a corner case, when we render glyphs via mask cache, and
    when we need to upload new glyphs cache, we need to flush both the
    mask and dest buffer. But we the dest arg may point to a NULL buffer
    at that time, we need to check it firstly. If the dest buffer is NULL.
    Then we don't need to flush both the dest and mask buffer.
    
    This commit fix a potential crash.
    
    Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>