xserver: Branch 'master'

[Adam Jackson]

 glamor/glamor.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 58d54ee82dfae5486bc09d04d2760c922d54d631
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Wed Sep 16 22:10:22 2015 +0100

    glamor: explicitly check for GL_OES_EGL_image
    
    Otherwise we'll fail miserably later on as we try to use
    glEGLImageTargetTexture2DOES.
    
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index d4a0236..8178785 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -545,6 +545,11 @@ glamor_init(ScreenPtr screen, unsigned int flags)
         }
     }
 
+    if (!epoxy_has_gl_extension("GL_OES_EGL_image")) {
+        ErrorF("GL_OES_EGL_image not available\n");
+        goto fail;
+    }
+
     glamor_priv->has_rw_pbo = FALSE;
     if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
         glamor_priv->has_rw_pbo = TRUE;