glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_egl.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit aa2b71332143fe7d62b3c3f16462f8335e3a7844
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Aug 7 18:16:58 2012 +0200

    Prefer KHR_surfaceless_context EGL extension over KHR_surfaceless_opengl/gles2.
    
    Current Mesa Git only advertises the former instead of the latter.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>

commit 67fb454c47903d4dc9b439f2c5af73a331cbc3cb
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Aug 7 18:13:32 2012 +0200

    Print space between name of missing EGL extension and 'required'.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>