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

glamor_egl: use LogMessage over xf86DrvMsg 

Much of glamor already use LogMessage() so we might as well be
consistent. This effectively paves the way of making glamor-egl xf86
agnostic.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Emil Velikov 2019-07-12 17:47:27 +01:00 committed by Emil Velikov
parent 3340ddf377
commit 52a2a052aa
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
glamor/glamor_egl.c
View File

@ -146,13 +146,12 @@ glamor_egl_get_gbm_device(ScreenPtr screen)
Bool Bool
glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride) glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
{ {
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
PixmapPtr screen_pixmap; PixmapPtr screen_pixmap;
screen_pixmap = screen->GetScreenPixmap(screen); screen_pixmap = screen->GetScreenPixmap(screen);
if (!glamor_egl_create_textured_pixmap(screen_pixmap, handle, stride)) { if (!glamor_egl_create_textured_pixmap(screen_pixmap, handle, stride)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to create textured screen."); "Failed to create textured screen.");
return FALSE; return FALSE;
} }
@ -193,7 +192,7 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
*/ */
ret = drmPrimeHandleToFD(glamor_egl->fd, handle, O_CLOEXEC, &fd); ret = drmPrimeHandleToFD(glamor_egl->fd, handle, O_CLOEXEC, &fd);
if (ret) { if (ret) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to make prime FD for handle: %d\n", errno); "Failed to make prime FD for handle: %d\n", errno);
return FALSE; return FALSE;
} }
@ -204,7 +203,7 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
stride, stride,
pixmap->drawable.depth, pixmap->drawable.depth,
pixmap->drawable.bitsPerPixel)) { pixmap->drawable.bitsPerPixel)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to make import prime FD as pixmap: %d\n", errno); "Failed to make import prime FD as pixmap: %d\n", errno);
close(fd); close(fd);
return FALSE; return FALSE;
@ -298,7 +297,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
format = GBM_FORMAT_R8; format = GBM_FORMAT_R8;
break; break;
default: default:
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to make %d depth, %dbpp pixmap exportable\n", "Failed to make %d depth, %dbpp pixmap exportable\n",
pixmap->drawable.depth, pixmap->drawable.bitsPerPixel); pixmap->drawable.depth, pixmap->drawable.bitsPerPixel);
return FALSE; return FALSE;
@ -330,7 +329,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
} }
if (!bo) { if (!bo) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to make %dx%dx%dbpp GBM bo\n", "Failed to make %dx%dx%dbpp GBM bo\n",
width, height, pixmap->drawable.bitsPerPixel); width, height, pixmap->drawable.bitsPerPixel);
return FALSE; return FALSE;
@ -341,7 +340,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
gbm_bo_get_stride(bo), NULL); gbm_bo_get_stride(bo), NULL);
if (!glamor_egl_create_textured_pixmap_from_gbm_bo(exported, bo, if (!glamor_egl_create_textured_pixmap_from_gbm_bo(exported, bo,
used_modifiers)) { used_modifiers)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to make %dx%dx%dbpp pixmap from GBM bo\n", "Failed to make %dx%dx%dbpp pixmap from GBM bo\n",
width, height, pixmap->drawable.bitsPerPixel); width, height, pixmap->drawable.bitsPerPixel);
screen->DestroyPixmap(exported); screen->DestroyPixmap(exported);
@ -871,7 +870,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
glamor_egl->device_path = drmGetDeviceNameFromFd2(glamor_egl->fd); glamor_egl->device_path = drmGetDeviceNameFromFd2(glamor_egl->fd);
if (!dri3_screen_init(screen, &glamor_dri3_info)) { if (!dri3_screen_init(screen, &glamor_dri3_info)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to initialize DRI3.\n"); "Failed to initialize DRI3.\n");
} }
} }
@ -934,12 +933,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
glamor_egl->display = glamor_egl_get_display(EGL_PLATFORM_GBM_MESA, glamor_egl->display = glamor_egl_get_display(EGL_PLATFORM_GBM_MESA,
glamor_egl->gbm); glamor_egl->gbm);
if (!glamor_egl->display) { if (!glamor_egl->display) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglGetDisplay() failed\n"); LogMessage(X_ERROR, "eglGetDisplay() failed\n");
goto error; goto error;
} }
if (!eglInitialize(glamor_egl->display, NULL, NULL)) { if (!eglInitialize(glamor_egl->display, NULL, NULL)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n"); LogMessage(X_ERROR, "eglInitialize() failed\n");
glamor_egl->display = EGL_NO_DISPLAY; glamor_egl->display = EGL_NO_DISPLAY;
goto error; goto error;
} }
@ -989,13 +988,13 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
EGL_NONE EGL_NONE
}; };
if (!eglBindAPI(EGL_OPENGL_ES_API)) { if (!eglBindAPI(EGL_OPENGL_ES_API)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"glamor: Failed to bind either GL or GLES APIs.\n"); "glamor: Failed to bind either GL or GLES APIs.\n");
goto error; goto error;
} }
if (!eglChooseConfig(glamor_egl->display, NULL, &egl_config, 1, &n)) { if (!eglChooseConfig(glamor_egl->display, NULL, &egl_config, 1, &n)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"glamor: No acceptable EGL configs found\n"); "glamor: No acceptable EGL configs found\n");
goto error; goto error;
} }
@ -1005,26 +1004,26 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
config_attribs); config_attribs);
} }
if (glamor_egl->context == EGL_NO_CONTEXT) { if (glamor_egl->context == EGL_NO_CONTEXT) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"glamor: Failed to create GL or GLES2 contexts\n"); "glamor: Failed to create GL or GLES2 contexts\n");
goto error; goto error;
} }
if (!eglMakeCurrent(glamor_egl->display, if (!eglMakeCurrent(glamor_egl->display,
EGL_NO_SURFACE, EGL_NO_SURFACE, glamor_egl->context)) { EGL_NO_SURFACE, EGL_NO_SURFACE, glamor_egl->context)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"Failed to make EGL context current\n"); "Failed to make EGL context current\n");
goto error; goto error;
} }
renderer = glGetString(GL_RENDERER); renderer = glGetString(GL_RENDERER);
if (!renderer) { if (!renderer) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"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 (strstr((const char *)renderer, "llvmpipe")) {
xf86DrvMsg(scrn->scrnIndex, X_INFO, LogMessage(X_INFO,
"Refusing to try glamor on llvmpipe\n"); "Refusing to try glamor on llvmpipe\n");
goto error; goto error;
} }
@ -1036,13 +1035,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
lastGLContext = NULL; lastGLContext = NULL;
if (!epoxy_has_gl_extension("GL_OES_EGL_image")) { if (!epoxy_has_gl_extension("GL_OES_EGL_image")) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, LogMessage(X_ERROR,
"glamor acceleration requires GL_OES_EGL_image\n"); "glamor acceleration requires GL_OES_EGL_image\n");
goto error; goto error;
} }
xf86DrvMsg(scrn->scrnIndex, X_INFO, "glamor X acceleration enabled on %s\n", LogMessage(X_INFO, "glamor X acceleration enabled on %s\n", renderer);
renderer);
#ifdef GBM_BO_WITH_MODIFIERS #ifdef GBM_BO_WITH_MODIFIERS
if (epoxy_has_egl_extension(glamor_egl->display, if (epoxy_has_egl_extension(glamor_egl->display,