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

DRI2: fix swapbuffers handling of SBC and target MSC 

Returns expected SBC after completion of swap to caller, as required by
OML_sync_control spec, instead of the last_swap_target value.

Passes target_msc, divisor, remainder, correctly for
glXSwapBuffersMscOML() call, while retaining old behaviour for simple
glXSwapBuffers() call.

An OML swap can have a 0 target_msc, which just means it needs to
satisfy the divisor/remainder equation.  Pass this down to the driver as
needed so we can support it.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
This commit is contained in:
Jesse Barnes 2010-03-04 10:31:59 -08:00
parent 751e8c09d3
commit b180e43977
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xfree86/dri2/dri2.c
View File

@ -631,12 +631,21 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
return Success; return Success;
} }
/*
* In the simple glXSwapBuffers case, all params will be 0, and we just
* need to schedule a swap for the last swap target + the swap interval.
*/
if (target_msc == 0 && divisor == 0 && remainder == 0) {
/* /*
* Swap target for this swap is last swap target + swap interval since * Swap target for this swap is last swap target + swap interval since
* we have to account for the current swap count, interval, and the * we have to account for the current swap count, interval, and the
* number of pending swaps. * number of pending swaps.
*/ */
*swap_target = pPriv->last_swap_target + pPriv->swap_interval; *swap_target = pPriv->last_swap_target + pPriv->swap_interval;
} else {
/* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
*swap_target = target_msc;
}
ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer, ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,
swap_target, divisor, remainder, func, data); swap_target, divisor, remainder, func, data);
@ -649,6 +658,11 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
pPriv->swapsPending++; pPriv->swapsPending++;
pPriv->last_swap_target = *swap_target; pPriv->last_swap_target = *swap_target;
/* According to spec, return expected swapbuffers count SBC after this swap
* will complete.
*/
*swap_target = pPriv->swap_count + pPriv->swapsPending;
return Success; return Success;
} }