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

dri2: declare variables where needed in DRI2GetMSC()

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 13:05:31 +01:00
committed by Enrico Weigelt
parent 31520b857b
commit 63eeb1ea05
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Xext/dri2/dri2.c
View File

@@ -1181,10 +1181,8 @@ DRI2GetMSC(DrawablePtr pDraw, CARD64 * ust, CARD64 * msc, CARD64 * sbc)
{ {
ScreenPtr pScreen = pDraw->pScreen; ScreenPtr pScreen = pDraw->pScreen;
DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
DRI2DrawablePtr pPriv;
Bool ret;
pPriv = DRI2GetDrawable(pDraw); DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) { if (pPriv == NULL) {
xf86DrvMsg(pScreen->myNum, X_ERROR, xf86DrvMsg(pScreen->myNum, X_ERROR,
"[DRI2] %s: bad drawable\n", __func__); "[DRI2] %s: bad drawable\n", __func__);
@@ -1203,8 +1201,7 @@ DRI2GetMSC(DrawablePtr pDraw, CARD64 * ust, CARD64 * msc, CARD64 * sbc)
* drawables * drawables
*/ */
ret = (*ds->GetMSC) (pDraw, ust, msc); if (!(ds->GetMSC(pDraw, ust, msc)))
if (!ret)
return BadDrawable; return BadDrawable;
*sbc = pPriv->swap_count; *sbc = pPriv->swap_count;
@@ -1217,23 +1214,17 @@ DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
CARD64 divisor, CARD64 remainder) CARD64 divisor, CARD64 remainder)
{ {
DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
DRI2DrawablePtr pPriv; DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
Bool ret;
pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) if (pPriv == NULL)
return BadDrawable; return BadDrawable;
/* Old DDX just completes immediately */ /* Old DDX just completes immediately */
if (!ds->ScheduleWaitMSC) { if (!ds->ScheduleWaitMSC) {
DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0); DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);
return Success; return Success;
} }
ret = if (!(ds->ScheduleWaitMSC(client, pDraw, target_msc, divisor, remainder)))
(*ds->ScheduleWaitMSC) (client, pDraw, target_msc, divisor, remainder);
if (!ret)
return BadDrawable; return BadDrawable;
return Success; return Success;
@@ -1242,9 +1233,7 @@ DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
int int
DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc) DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc)
{ {
DRI2DrawablePtr pPriv; DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
pPriv = DRI2GetDrawable(pDraw);
if (pPriv == NULL) if (pPriv == NULL)
return BadDrawable; return BadDrawable;