OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Require __DRI_DRI2 v2 for doing X11 DRI2.

Browse Source 
The only implementer in tree is v4.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20044>
This commit is contained in:
Emma Anholt
2022-11-28 11:22:23 -08:00
committed by Marge Bot
parent 9fd2901454
commit f4af33a36c
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/glx/dri2_glx.c
View File

@@ -1103,25 +1103,16 @@ dri2CreateScreen(int screen, struct glx_display * priv)
psc->dri2 = (__DRIdri2Extension *) extensions[i]; psc->dri2 = (__DRIdri2Extension *) extensions[i];
} }
if (psc->core == NULL || psc->dri2 == NULL || psc->dri2->base.version < 3) { if (psc->core == NULL || psc->dri2 == NULL || psc->dri2->base.version < 4) {
ErrorMessageF("core dri or dri2 extension not found\n"); ErrorMessageF("core dri or dri2 extension not found\n");
goto handle_error; goto handle_error;
} }
if (psc->dri2->base.version >= 4) { psc->driScreen =
psc->driScreen = psc->dri2->createNewScreen2(screen, psc->fd,
psc->dri2->createNewScreen2(screen, psc->fd, (const __DRIextension **)&pdp->loader_extensions[0],
(const __DRIextension **) extensions,
&pdp->loader_extensions[0], &driver_configs, psc);
extensions,
&driver_configs, psc);
} else {
psc->driScreen =
psc->dri2->createNewScreen(screen, psc->fd,
(const __DRIextension **)
&pdp->loader_extensions[0],
&driver_configs, psc);
}
if (psc->driScreen == NULL) { if (psc->driScreen == NULL) {
ErrorMessageF("glx: failed to create dri2 screen\n"); ErrorMessageF("glx: failed to create dri2 screen\n");