glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_trapezoid.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit f233aeef15ca357c9a0a770687d13b6560871420
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date:   Wed Aug 1 18:27:29 2012 +0800

    glamor_trapezoid: workaround a glsl like problem.
    
    It seems that the following statement cann't run as expected on SNB.
    bool trap_left_vertical = (abs(trap_left_vertical_f - 1.0) <= 0.0001);
    
    Have to rewrite it to another style to let the vertical edge trapezoid
    to be rendered correctly.
    
    Reviewed-by: Junyan He <junyan.he at linux.intel.com>
    Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>