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

egl: inline DRI_KOPPER

Browse Source 
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
This commit is contained in:
Mike Blumenkrantz
2024-07-26 11:17:17 -04:00
committed by Marge Bot
parent 1d86bc8791
commit 5f8dec8f7c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -1552,7 +1552,7 @@ dri2_create_drawable(struct dri2_egl_display *dri2_dpy,
struct dri2_egl_surface *dri2_surf, void *loaderPrivate)
{
if (dri2_dpy->kopper) {
dri2_surf->dri_drawable = dri2_dpy->kopper->createNewDrawable(
dri2_surf->dri_drawable = kopperCreateNewDrawable(
dri2_dpy->dri_screen_render_gpu, config, loaderPrivate,
&(__DRIkopperDrawableInfo){
#if defined(HAVE_X11_PLATFORM) && defined(HAVE_DRI3)

8
src/egl/drivers/dri2/platform_wayland.c
View File

@@ -898,7 +898,7 @@ dri2_wl_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
if (dri2_dpy->kopper)
dri2_dpy->kopper->setSwapInterval(dri2_surf->dri_drawable, interval);
kopperSetSwapInterval(dri2_surf->dri_drawable, interval);
return EGL_TRUE;
}
@@ -2711,12 +2711,12 @@ dri2_wl_kopper_swap_buffers_with_damage(_EGLDisplay *disp, _EGLSurface *draw,
if (n_rects) {
if (dri2_dpy->kopper)
dri2_dpy->kopper->swapBuffersWithDamage(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY, n_rects, rects);
kopperSwapBuffersWithDamage(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY, n_rects, rects);
else
driSwapBuffersWithDamage(dri2_surf->dri_drawable, n_rects, rects);
} else {
if (dri2_dpy->kopper)
dri2_dpy->kopper->swapBuffers(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY);
kopperSwapBuffers(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY);
else
driSwapBuffers(dri2_surf->dri_drawable);
}
@@ -2786,7 +2786,7 @@ dri2_wl_kopper_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surface)
/* This can legitimately be null for lavapipe */
if (dri2_dpy->kopper)
return dri2_dpy->kopper->queryBufferAge(dri2_surf->dri_drawable);
return kopperQueryBufferAge(dri2_surf->dri_drawable);
else
return dri2_dpy->swrast->queryBufferAge(dri2_surf->dri_drawable);
return 0;

12
src/egl/drivers/dri2/platform_x11.c
View File

@@ -1113,7 +1113,7 @@ dri2_x11_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw)
* "The contents of ancillary buffers are always undefined
* after calling eglSwapBuffers."
*/
dri2_dpy->kopper->swapBuffers(dri2_surf->dri_drawable,
kopperSwapBuffers(dri2_surf->dri_drawable,
__DRI2_FLUSH_INVALIDATE_ANCILLARY);
return EGL_TRUE;
} else if (!dri2_dpy->flush) {
@@ -1187,12 +1187,12 @@ dri2_x11_kopper_swap_buffers_with_damage(_EGLDisplay *disp, _EGLSurface *draw,
assert(dri2_dpy->kopper);
if (numRects) {
if (dri2_dpy->kopper)
dri2_dpy->kopper->swapBuffersWithDamage(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY, numRects, rects);
kopperSwapBuffersWithDamage(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY, numRects, rects);
else
driSwapBuffersWithDamage(dri2_surf->dri_drawable, numRects, rects);
} else {
if (dri2_dpy->kopper)
dri2_dpy->kopper->swapBuffers(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY);
kopperSwapBuffers(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY);
else
driSwapBuffers(dri2_surf->dri_drawable);
}
@@ -1218,7 +1218,7 @@ dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
if (dri2_dpy->kopper) {
dri2_dpy->kopper->setSwapInterval(dri2_surf->dri_drawable, interval);
kopperSetSwapInterval(dri2_surf->dri_drawable, interval);
return EGL_TRUE;
}
@@ -1489,7 +1489,7 @@ dri2_kopper_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
/* This can legitimately be null for lavapipe */
if (dri2_dpy->kopper)
dri2_dpy->kopper->setSwapInterval(dri2_surf->dri_drawable, interval);
kopperSetSwapInterval(dri2_surf->dri_drawable, interval);
return EGL_TRUE;
}
@@ -1525,7 +1525,7 @@ dri2_kopper_query_buffer_age(_EGLDisplay *disp, _EGLSurface *surf)
/* This can legitimately be null for lavapipe */
if (dri2_dpy->kopper)
return dri2_dpy->kopper->queryBufferAge(dri2_surf->dri_drawable);
return kopperQueryBufferAge(dri2_surf->dri_drawable);
else
return dri2_dpy->swrast->queryBufferAge(dri2_surf->dri_drawable);