frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Only check for llvmpipe renderer 

The virgl driver exposes the name of the host renderer which might be llvmpipe.
In this case we still need glamor to be initialized.

Only check if the renderer starts with llvmpipe (which is what llvmpipe exposes).

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Corentin Noël 2022-08-01 16:03:38 +02:00 committed by Emma Anholt
parent a60799aed6
commit fdebbc60d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glamor/glamor_egl.c
View File

@ -1080,7 +1080,7 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
"glGetString() returned NULL, your GL is broken\n"); "glGetString() returned NULL, your GL is broken\n");
goto error; goto error;
} }
if (strstr((const char *)renderer, "llvmpipe")) { if (!strncmp("llvmpipe", (const char *)renderer, strlen("llvmpipe"))) {
if (scrn->confScreen->num_gpu_devices) if (scrn->confScreen->num_gpu_devices)
xf86DrvMsg(scrn->scrnIndex, X_INFO, xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Allowing glamor on llvmpipe for PRIME\n"); "Allowing glamor on llvmpipe for PRIME\n");

2
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -1030,7 +1030,7 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen)
ErrorF("glGetString() returned NULL, your GL is broken\n"); ErrorF("glGetString() returned NULL, your GL is broken\n");
goto error; goto error;
} }
if (strstr((const char *)renderer, "llvmpipe")) { if (!strncmp("llvmpipe", (const char *)renderer, strlen("llvmpipe"))) {
ErrorF("Refusing to try glamor on llvmpipe\n"); ErrorF("Refusing to try glamor on llvmpipe\n");
goto error; goto error;
} }