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

egl_dri2: Check for xcb_connect() failure the right way

Browse Source 
It always returns a valid xcb_connection_t, but if connection failed, it's in the
error state.
This commit is contained in:
Kristian Høgsberg
2010-05-28 15:50:11 -04:00
parent ba10b2732b
commit c5ddaa2cd7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -647,16 +647,14 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp,
disp->DriverData = (void *) dri2_dpy;
if (disp->NativeDisplay == NULL) {
dri2_dpy->conn = xcb_connect(0, 0);
if (!dri2_dpy->conn) {
_eglLog(_EGL_WARNING, "DRI2: xcb_connect failed");
goto cleanup_dpy;
}
} else {
dri2_dpy->conn = XGetXCBConnection(disp->NativeDisplay);
}
if (dri2_dpy->conn == NULL)
goto cleanup_conn;
if (xcb_connection_has_error(dri2_dpy->conn)) {
_eglLog(_EGL_WARNING, "DRI2: xcb_connect failed");
goto cleanup_dpy;
}
if (dri2_dpy->conn) {
if (!dri2_connect(dri2_dpy))