XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dri2: replace our own xf86DrvMsg() macro by LogMessage()

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-02-06 19:47:24 +01:00
committed by Enrico Weigelt
parent 7b930592e6
commit 07b917d6a5
1 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Xext/dri2/dri2.c
View File

@@ -48,14 +48,6 @@
#include "dri2int.h" #include "dri2int.h"
#include "damage.h" #include "damage.h"
/* needs xf86.h otherwise */
/* format is treated as part of the varargs to swallow the comma */
#define xf86DrvMsg(scrnIndex, type, /* format, */ ...) \
do { \
(void)scrnIndex; \
LogMessage(type, __VA_ARGS__); \
} while (0);
CARD8 dri2_major; /* version of DRI2 supported by DDX */ CARD8 dri2_major; /* version of DRI2 supported by DDX */
CARD8 dri2_minor; CARD8 dri2_minor;
@@ -949,11 +941,9 @@ static void
DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame, DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,
unsigned int tv_sec, unsigned int tv_usec) unsigned int tv_sec, unsigned int tv_usec)
{ {
ScreenPtr pScreen = pDraw->pScreen;
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) { if (pPriv == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: bad drawable\n", __func__);
"[DRI2] %s: bad drawable\n", __func__);
return; return;
} }
@@ -981,12 +971,9 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
unsigned int tv_sec, unsigned int tv_usec, int type, unsigned int tv_sec, unsigned int tv_usec, int type,
DRI2SwapEventPtr swap_complete, void *swap_data) DRI2SwapEventPtr swap_complete, void *swap_data)
{ {
ScreenPtr pScreen = pDraw->pScreen;
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) { if (pPriv == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: bad drawable\n", __func__);
"[DRI2] %s: bad drawable\n", __func__);
return; return;
} }
@@ -1037,13 +1024,11 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
CARD64 divisor, CARD64 remainder, CARD64 * swap_target, CARD64 divisor, CARD64 remainder, CARD64 * swap_target,
DRI2SwapEventPtr func, void *data) DRI2SwapEventPtr func, void *data)
{ {
ScreenPtr pScreen = pDraw->pScreen;
DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) { if (pPriv == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: bad drawable\n", __func__);
"[DRI2] %s: bad drawable\n", __func__);
return BadDrawable; return BadDrawable;
} }
@@ -1063,8 +1048,7 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i]; pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
} }
if (pSrcBuffer == NULL || pDestBuffer == NULL) { if (pSrcBuffer == NULL || pDestBuffer == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: drawable has no back or front?\n", __func__);
"[DRI2] %s: drawable has no back or front?\n", __func__);
return BadDrawable; return BadDrawable;
} }
@@ -1122,8 +1106,7 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
&target_msc, divisor, remainder, func, data); &target_msc, divisor, remainder, func, data);
if (!ret) { if (!ret) {
pPriv->swapsPending--; /* didn't schedule */ pPriv->swapsPending--; /* didn't schedule */
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: driver failed to schedule swap\n", __func__);
"[DRI2] %s: driver failed to schedule swap\n", __func__);
return BadDrawable; return BadDrawable;
} }
@@ -1137,12 +1120,10 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
void void
DRI2SwapInterval(DrawablePtr pDrawable, int interval) DRI2SwapInterval(DrawablePtr pDrawable, int interval)
{ {
ScreenPtr pScreen = pDrawable->pScreen;
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);
if (pPriv == NULL) { if (pPriv == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: bad drawable\n", __func__);
"[DRI2] %s: bad drawable\n", __func__);
return; return;
} }
@@ -1153,13 +1134,11 @@ DRI2SwapInterval(DrawablePtr pDrawable, int interval)
int int
DRI2GetMSC(DrawablePtr pDraw, CARD64 * ust, CARD64 * msc, CARD64 * sbc) DRI2GetMSC(DrawablePtr pDraw, CARD64 * ust, CARD64 * msc, CARD64 * sbc)
{ {
ScreenPtr pScreen = pDraw->pScreen;
DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) { if (pPriv == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] %s: bad drawable\n", __func__);
"[DRI2] %s: bad drawable\n", __func__);
return BadDrawable; return BadDrawable;
} }
@@ -1384,8 +1363,7 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
drmVersionPtr version = drmGetVersion(info->fd); drmVersionPtr version = drmGetVersion(info->fd);
if (!version) { if (!version) {
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR, "[DRI2] Couldn't drmGetVersion() on non-PCI device, "
"[DRI2] Couldn't drmGetVersion() on non-PCI device, "
"no driver name found.\n"); "no driver name found.\n");
return NULL; return NULL;
} }
@@ -1412,7 +1390,7 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
} }
} }
xf86DrvMsg(pScreen->myNum, X_ERROR, LogMessage(X_ERROR,
"[DRI2] No driver mapping found for PCI device " "[DRI2] No driver mapping found for PCI device "
"0x%04x / 0x%04x\n", "0x%04x / 0x%04x\n",
dev->deviceinfo.pci->vendor_id, dev->deviceinfo.pci->device_id); dev->deviceinfo.pci->vendor_id, dev->deviceinfo.pci->device_id);
@@ -1560,10 +1538,10 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
ds->SetWindowPixmap = pScreen->SetWindowPixmap; ds->SetWindowPixmap = pScreen->SetWindowPixmap;
pScreen->SetWindowPixmap = DRI2SetWindowPixmap; pScreen->SetWindowPixmap = DRI2SetWindowPixmap;
xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n"); LogMessage(X_INFO, "[DRI2] Setup complete\n");
for (int i = 0; i < ARRAY_SIZE(driverTypeNames); i++) { for (int i = 0; i < ARRAY_SIZE(driverTypeNames); i++) {
if (i < ds->numDrivers && ds->driverNames[i]) { if (i < ds->numDrivers && ds->driverNames[i]) {
xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] %s driver: %s\n", LogMessage(X_INFO, "[DRI2] %s driver: %s\n",
driverTypeNames[i], ds->driverNames[i]); driverTypeNames[i], ds->driverNames[i]);
} }
} }
@@ -1571,7 +1549,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
return TRUE; return TRUE;
err_out: err_out:
xf86DrvMsg(pScreen->myNum, X_WARNING, LogMessage(X_WARNING,
"[DRI2] Initialization failed for info version %d.\n", "[DRI2] Initialization failed for info version %d.\n",
info->version); info->version);
free(ds); free(ds);