From 977f3acfceb91f1dd10c8bf84b9d7515b2a59457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 20 Dec 2019 15:51:00 +0100 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke (Cherry picked from commit 5bfca0038e92d61e58d4dc1a54748faef8273023) --- glamor/glamor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/glamor/glamor.c b/glamor/glamor.c index b1c7d9f13..a6cc798f8 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -624,6 +624,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->can_copyplane = (gl_version >= 30);