xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 5bfca0038e92d61e58d4dc1a54748faef8273023
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Wed Dec 18 18:18:50 2019 +0100

    glamor: Only use dual blending with GLSL >= 1.30
    
    It can't be used with older GLSL. Fixes a crash when attempting to
    anyway.
    
    Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/97
    Fixes: e7308b6c7756 "glamor: Add support for CA rendering in a single pass."
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 4d6a8394e..59178b930 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -797,6 +797,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
         epoxy_gl_version() >= 30 ||
         epoxy_has_gl_extension("GL_NV_pack_subimage");
     glamor_priv->has_dual_blend =
+        glamor_priv->glsl_version >= 130 &&
         epoxy_has_gl_extension("GL_ARB_blend_func_extended");
     glamor_priv->has_clear_texture =
         epoxy_gl_version() >= 44 ||