OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx/dri3: Implement GLX_EXT_swap_control_tear

Browse Source 
Not wired up for DRI2 because it would require server-side support,
which I'm not especially interested in writing.

Fixes: mesa/mesa#96
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6671>
This commit is contained in:
Adam Jackson
2020-09-09 15:14:30 -04:00
parent 60ebeb4608
commit 5e9e457383
7 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/relnotes/new_features.txt
View File

@@ -4,3 +4,4 @@ GL_NV_half_float
EGL_KHR_swap_buffers_with_damage on X11 (DRI3)
VK_PRESENT_MODE_FIFO_RELAXED on X11
GLX_EXT_swap_control for DRI2 and DRI3
GLX_EXT_swap_control_tear for DRI3

1
src/glx/dri3_glx.c
View File

@@ -742,6 +742,7 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
extensions = psc->core->getExtensions(psc->driScreen);
__glXEnableDirectExtension(&psc->base, "GLX_EXT_swap_control");
__glXEnableDirectExtension(&psc->base, "GLX_EXT_swap_control_tear");
__glXEnableDirectExtension(&psc->base, "GLX_SGI_swap_control");
__glXEnableDirectExtension(&psc->base, "GLX_MESA_swap_control");
__glXEnableDirectExtension(&psc->base, "GLX_SGI_make_current_read");

4
src/glx/glx_pbuffer.c
View File

@@ -352,6 +352,10 @@ __glXGetDrawableAttribute(Display * dpy, GLXDrawable drawable,
} else if (attribute == GLX_MAX_SWAP_INTERVAL_EXT) {
*value = INT_MAX;
return 0;
} else if (attribute == GLX_LATE_SWAPS_TEAR_EXT) {
*value = __glXExtensionBitIsEnabled(pdraw->psc,
EXT_swap_control_tear_bit);
return 0;
}
}
#endif

3
src/glx/glxcmds.c
View File

@@ -1863,7 +1863,8 @@ glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
return;
}
if (interval < 0) {
if (interval < 0 &&
!__glXExtensionBitIsEnabled(pdraw->psc, EXT_swap_control_tear_bit)) {
__glXSendError(dpy, BadValue, interval, 0, True);
return;
}

1
src/glx/glxextensions.c
View File

@@ -148,6 +148,7 @@ static const struct extension_info known_glx_extensions[] = {
{ GLX(EXT_framebuffer_sRGB), VER(0,0), Y, Y, N, N },
{ GLX(EXT_import_context), VER(0,0), Y, Y, N, N },
{ GLX(EXT_swap_control), VER(0,0), Y, N, N, Y },
{ GLX(EXT_swap_control_tear), VER(0,0), Y, N, N, Y },
{ GLX(EXT_texture_from_pixmap), VER(0,0), Y, N, N, N },
{ GLX(EXT_visual_info), VER(0,0), Y, Y, N, N },
{ GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N },

1
src/glx/glxextensions.h
View File

@@ -52,6 +52,7 @@ enum
EXT_framebuffer_sRGB_bit,
EXT_import_context_bit,
EXT_swap_control_bit,
EXT_swap_control_tear_bit,
EXT_texture_from_pixmap_bit,
EXT_visual_info_bit,
EXT_visual_rating_bit,

12
src/loader/loader_dri3_helper.c
View File

@@ -969,7 +969,7 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw,
*/
++draw->send_sbc;
if (target_msc == 0 && divisor == 0 && remainder == 0)
target_msc = draw->msc + draw->swap_interval *
target_msc = draw->msc + abs(draw->swap_interval) *
(draw->send_sbc - draw->recv_sbc);
else if (divisor == 0 && remainder > 0) {
/* From the GLX_OML_sync_control spec:
@@ -989,11 +989,19 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw,
* "If <interval> is set to a value of 0, buffer swaps are not
* synchronized to a video frame."
*
* From GLX_EXT_swap_control_tear:
*
* "If <interval> is negative, the minimum number of video frames
* between buffer swaps is the absolute value of <interval>. In this
* case, if abs(<interval>) video frames have already passed from
* the previous swap when the swap is ready to be performed, the
* swap will occur without synchronization to a video frame."
*
* Implementation note: It is possible to enable triple buffering
* behaviour by not using XCB_PRESENT_OPTION_ASYNC, but this should not be
* the default.
*/
if (draw->swap_interval == 0)
if (draw->swap_interval <= 0)
options |= XCB_PRESENT_OPTION_ASYNC;
/* If we need to populate the new back, but need to reuse the back