glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_getimage.c |    1 -
 src/glamor_putimage.c |    1 -
 src/glamor_setspans.c |    8 ++++----
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 7b8d184bc268ad70b89d2940d6cc7bb517b250b6
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Oct 19 16:10:54 2013 -0600

    Remove useless return statement
    
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>

commit 2cefae213c15fb381b49b74b2cdd6cb514c63a7d
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Oct 19 16:10:53 2013 -0600

    Remove redundant dispatch->glEnable(GL_TEXTURE_2D)
    
    The same call was already made a few lines earlier.
    
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>

commit 655e900025d903c2c9606ddaea1e8d5d94ea1a40
Author: Brian Paul <brianp at vmware.com>
Date:   Sat Oct 19 16:10:52 2013 -0600

    Fix _glamor_set_spans() bug (re-used 'n' variable)
    
    n was used as a function parameter.  But inside the for (i=1..n) loop,
    n got reassigned as REGION_NUM_RECTS() and then decremented to zero by
    the while loop.  This caused the for loop to only iterate once instead
    of 'n' times.
    
    This patch renames the n parameter to numPoints.
    
    Found by code inspection.  Untested.
    
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>