2015-10-31 0:03 GMT+08:00 Martin Peres <martin.pe...@linux.intel.com>: > Signed-off-by: Martin Peres <martin.pe...@linux.intel.com>
Reviewed-by: Boyan Ding <boyan.j.d...@gmail.com> > --- > src/egl/drivers/dri2/egl_dri2.c | 6 +++--- > src/egl/drivers/dri2/platform_x11.c | 6 +++++- > src/egl/drivers/dri2/platform_x11_dri3.c | 10 +++++----- > 3 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c > index ba16b94..d34b161 100644 > --- a/src/egl/drivers/dri2/egl_dri2.c > +++ b/src/egl/drivers/dri2/egl_dri2.c > @@ -391,13 +391,13 @@ dri2_bind_extensions(struct dri2_egl_display *dri2_dpy, > void *field; > > for (i = 0; extensions[i]; i++) { > - _eglLog(_EGL_DEBUG, "DRI2: found extension `%s'", extensions[i]->name); > + _eglLog(_EGL_DEBUG, "found extension `%s'", extensions[i]->name); > for (j = 0; matches[j].name; j++) { > if (strcmp(extensions[i]->name, matches[j].name) == 0 && > extensions[i]->version >= matches[j].version) { > field = ((char *) dri2_dpy + matches[j].offset); > *(const __DRIextension **) field = extensions[i]; > - _eglLog(_EGL_INFO, "DRI2: found extension %s version %d", > + _eglLog(_EGL_INFO, "found extension %s version %d", > extensions[i]->name, extensions[i]->version); > } > } > @@ -406,7 +406,7 @@ dri2_bind_extensions(struct dri2_egl_display *dri2_dpy, > for (j = 0; matches[j].name; j++) { > field = ((char *) dri2_dpy + matches[j].offset); > if (*(const __DRIextension **) field == NULL) { > - _eglLog(_EGL_WARNING, "DRI2: did not find extension %s version %d", > + _eglLog(_EGL_WARNING, "did not find extension %s version %d", > matches[j].name, matches[j].version); > ret = EGL_FALSE; > } > diff --git a/src/egl/drivers/dri2/platform_x11.c > b/src/egl/drivers/dri2/platform_x11.c > index 10aa5b6..41f694e 100644 > --- a/src/egl/drivers/dri2/platform_x11.c > +++ b/src/egl/drivers/dri2/platform_x11.c > @@ -1278,7 +1278,7 @@ dri2_initialize_x11_dri3(_EGLDriver *drv, _EGLDisplay > *disp) > } > > if (xcb_connection_has_error(dri2_dpy->conn)) { > - _eglLog(_EGL_WARNING, "DRI2: xcb_connect failed"); > + _eglLog(_EGL_WARNING, "DRI3: xcb_connect failed"); > goto cleanup_dpy; > } > > @@ -1329,6 +1329,8 @@ dri2_initialize_x11_dri3(_EGLDriver *drv, _EGLDisplay > *disp) > */ > dri2_dpy->vtbl = &dri3_x11_display_vtbl; > > + _eglLog(_EGL_INFO, "Using DRI3"); > + > return EGL_TRUE; > > cleanup_configs: > @@ -1426,6 +1428,8 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay > *disp) > */ > dri2_dpy->vtbl = &dri2_x11_display_vtbl; > > + _eglLog(_EGL_INFO, "Using DRI2"); > + > return EGL_TRUE; > > cleanup_configs: > diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c > b/src/egl/drivers/dri2/platform_x11_dri3.c > index bd6d33f..df75484 100644 > --- a/src/egl/drivers/dri2/platform_x11_dri3.c > +++ b/src/egl/drivers/dri2/platform_x11_dri3.c > @@ -536,7 +536,7 @@ dri3_x11_connect(struct dri2_egl_display *dri2_dpy) > dri3_query = > xcb_dri3_query_version_reply(dri2_dpy->conn, dri3_query_cookie, > &error); > if (dri3_query == NULL || error != NULL) { > - _eglLog(_EGL_WARNING, "DRI2: failed to query dri3 version"); > + _eglLog(_EGL_WARNING, "DRI3: failed to query the version"); > free(dri3_query); > free(error); > return EGL_FALSE; > @@ -547,7 +547,7 @@ dri3_x11_connect(struct dri2_egl_display *dri2_dpy) > xcb_present_query_version_reply(dri2_dpy->conn, > present_query_cookie, &error); > if (present_query == NULL || error != NULL) { > - _eglLog(_EGL_WARNING, "DRI2: failed to query Present version"); > + _eglLog(_EGL_WARNING, "DRI3: failed to query Present version"); > free(present_query); > free(error); > return EGL_FALSE; > @@ -564,10 +564,10 @@ dri3_x11_connect(struct dri2_egl_display *dri2_dpy) > dri2_dpy->fd = loader_dri3_open(dri2_dpy->conn, screen->root, 0); > if (dri2_dpy->fd < 0) { > int conn_error = xcb_connection_has_error(dri2_dpy->conn); > - _eglLog(_EGL_WARNING, "DRI2: Screen seem not DRI3 capable"); > + _eglLog(_EGL_WARNING, "DRI3: Screen seems not DRI3 capable"); > > if (conn_error) > - _eglLog(_EGL_WARNING, "DRI2: Failed to initialize DRI3"); > + _eglLog(_EGL_WARNING, "DRI3: Failed to initialize"); > > return EGL_FALSE; > } > @@ -576,7 +576,7 @@ dri3_x11_connect(struct dri2_egl_display *dri2_dpy) > > dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd, 0); > if (!dri2_dpy->driver_name) { > - _eglLog(_EGL_WARNING, "DRI2: No driver found"); > + _eglLog(_EGL_WARNING, "DRI3: No driver found"); > close(dri2_dpy->fd); > return EGL_FALSE; > } > -- > 2.6.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev