From cef31b2a389852794a6edbfa995da5f9b3c9c724 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 31 Jul 2019 17:49:34 +0100 Subject: [PATCH] glamor: update glamor_egl_init() to the new API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xserver as of xorg/xserver!235, has changed the function signature. It no longer uses a xf86 ScrnInfoPtr, but a ScreenPtr instead. Signed-off-by: Emil Velikov Reviewed-by: Michel Dänzer --- src/amdgpu_glamor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c index 5b8d560..bd3838c 100644 --- a/src/amdgpu_glamor.c +++ b/src/amdgpu_glamor.c @@ -115,7 +115,11 @@ Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn) return FALSE; } +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,20,99,1,0) if (glamor_egl_init(scrn, pAMDGPUEnt->fd)) { +#else + if (glamor_egl_init(xf86ScrnToScreen(scrn), pAMDGPUEnt->fd)) { +#endif xf86DrvMsg(scrn->scrnIndex, X_INFO, "glamor detected, initialising EGL layer.\n"); } else { -- GitLab