|
 |
bd52eb |
From 722dc4717a4bb1c0ff84f45d0251e3e456476a28 Mon Sep 17 00:00:00 2001
|
|
|
bd52eb |
From: Adam Jackson <ajax@redhat.com>
|
|
|
bd52eb |
Date: Fri, 14 Sep 2018 11:33:43 -0400
|
|
|
bd52eb |
Subject: [PATCH xserver] glamor_egl: Don't initialize on llvmpipe
|
|
|
bd52eb |
|
|
|
bd52eb |
---
|
|
|
bd52eb |
glamor/glamor_egl.c | 11 ++++++++++-
|
|
|
bd52eb |
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
bd52eb |
|
|
|
bd52eb |
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
|
|
|
bd52eb |
index df278b1a1a..2f06d6587d 100644
|
|
|
bd52eb |
--- a/glamor/glamor_egl.c
|
|
|
bd52eb |
+++ b/glamor/glamor_egl.c
|
|
|
bd52eb |
@@ -898,6 +898,7 @@ Bool
|
|
|
bd52eb |
glamor_egl_init(ScrnInfoPtr scrn, int fd)
|
|
|
bd52eb |
{
|
|
|
bd52eb |
struct glamor_egl_screen_private *glamor_egl;
|
|
|
bd52eb |
+ const GLubyte *renderer;
|
|
|
bd52eb |
|
|
|
bd52eb |
glamor_egl = calloc(sizeof(*glamor_egl), 1);
|
|
|
bd52eb |
if (glamor_egl == NULL)
|
|
|
bd52eb |
@@ -992,6 +993,14 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
|
|
|
bd52eb |
"Failed to make EGL context current\n");
|
|
|
bd52eb |
goto error;
|
|
|
bd52eb |
}
|
|
|
bd52eb |
+
|
|
|
bd52eb |
+ renderer = glGetString(GL_RENDERER);
|
|
|
bd52eb |
+ if (strstr(renderer, "llvmpipe")) {
|
|
|
bd52eb |
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
|
|
|
bd52eb |
+ "Refusing to try glamor on llvmpipe\n");
|
|
|
bd52eb |
+ goto error;
|
|
|
bd52eb |
+ }
|
|
|
bd52eb |
+
|
|
|
bd52eb |
/*
|
|
|
bd52eb |
* Force the next glamor_make_current call to set the right context
|
|
|
bd52eb |
* (in case of multiple GPUs using glamor)
|
|
|
bd52eb |
@@ -1005,7 +1014,7 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
|
|
|
bd52eb |
}
|
|
|
bd52eb |
|
|
|
bd52eb |
xf86DrvMsg(scrn->scrnIndex, X_INFO, "glamor X acceleration enabled on %s\n",
|
|
|
bd52eb |
- glGetString(GL_RENDERER));
|
|
|
bd52eb |
+ renderer);
|
|
|
bd52eb |
|
|
|
bd52eb |
#ifdef GBM_BO_WITH_MODIFIERS
|
|
|
bd52eb |
if (epoxy_has_egl_extension(glamor_egl->display,
|
|
|
bd52eb |
--
|
|
|
bd52eb |
2.17.1
|
|
|
bd52eb |
|