mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

egl/kopper: plumb through SwapBuffersWithDamage 

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27703>
This commit is contained in:
Mike Blumenkrantz 2024-02-13 14:43:20 -05:00 committed by Marge Bot
parent 0c82a67ea6
commit ad8794884c
3 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/kopper_interface.h
View File

@ -47,7 +47,7 @@ typedef struct __DRIkopperDrawableInfoRec __DRIkopperDrawableInfo;
* relying on a particular window system or DRI protocol.
*/
#define __DRI_KOPPER "DRI_Kopper"
#define __DRI_KOPPER_VERSION 1
#define __DRI_KOPPER_VERSION 2
struct __DRIkopperDrawableInfoRec {
bool multiplanes_available;
@ -71,6 +71,7 @@ struct __DRIkopperExtensionRec {
int64_t (*swapBuffers)(__DRIdrawable *draw, uint32_t flush_flags);
void (*setSwapInterval)(__DRIdrawable *drawable, int interval);
int (*queryBufferAge)(__DRIdrawable *drawable);
int64_t (*swapBuffersWithDamage)(__DRIdrawable *draw, uint32_t flush_flags, int nrects, const int *rects);
};
/**

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

@ -1010,6 +1010,28 @@ dri2_x11_post_sub_buffer(_EGLDisplay *disp, _EGLSurface *draw, EGLint x,
return dri2_x11_swap_buffers_region(disp, draw, 1, rect);
}
static EGLBoolean
dri2_x11_kopper_swap_buffers_with_damage(_EGLDisplay *disp, _EGLSurface *draw,
const EGLint *rects, EGLint numRects)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
/* swrast path unsupported for now */
assert(dri2_dpy->kopper);
if (numRects) {
if (dri2_dpy->kopper)
dri2_dpy->kopper->swapBuffersWithDamage(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY, numRects, rects);
else
dri2_dpy->core->swapBuffersWithDamage(dri2_surf->dri_drawable, numRects, rects);
} else {
if (dri2_dpy->kopper)
dri2_dpy->kopper->swapBuffers(dri2_surf->dri_drawable, __DRI2_FLUSH_INVALIDATE_ANCILLARY);
else
dri2_dpy->core->swapBuffers(dri2_surf->dri_drawable);
}
return EGL_TRUE;
}
static EGLBoolean
dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
@ -1356,6 +1378,7 @@ static const struct dri2_egl_display_vtbl dri2_x11_kopper_display_vtbl = {
.swap_interval = dri2_kopper_swap_interval,
.swap_buffers = dri2_x11_swap_buffers,
.swap_buffers_region = dri2_x11_swap_buffers_region,
.swap_buffers_with_damage = dri2_x11_kopper_swap_buffers_with_damage,
.post_sub_buffer = dri2_x11_post_sub_buffer,
.copy_buffers = dri2_x11_copy_buffers,
.query_buffer_age = dri2_kopper_query_buffer_age,

42
src/gallium/frontends/dri/kopper.c
View File

@ -613,9 +613,11 @@ kopper_present_texture(struct pipe_context *pipe, struct dri_drawable *drawable,
static inline void
kopper_copy_to_front(struct pipe_context *pipe,
struct dri_drawable *drawable,
struct pipe_resource *ptex)
struct pipe_resource *ptex,
unsigned nrects,
struct pipe_box *boxes)
{
kopper_present_texture(pipe, drawable, ptex, 0, NULL);
kopper_present_texture(pipe, drawable, ptex, nrects, boxes);
kopper_invalidate_drawable(opaque_dri_drawable(drawable));
}
@ -669,7 +671,7 @@ kopper_flush_frontbuffer(struct dri_context *ctx,
screen->fence_reference(screen, &drawable->throttle_fence, NULL);
}
drawable->throttle_fence = new_fence;
kopper_copy_to_front(st->pipe, ctx->draw, ptex);
kopper_copy_to_front(st->pipe, ctx->draw, ptex, 0, NULL);
}
return true;
@ -760,6 +762,8 @@ kopper_flush_swapbuffers(struct dri_context *ctx,
static void
kopper_swap_buffers(struct dri_drawable *drawable);
static void
kopper_swap_buffers_with_damage(struct dri_drawable *drawable, int nrects, const int *rects);
static struct dri_drawable *
kopper_create_drawable(struct dri_screen *screen, const struct gl_config *visual,
@ -781,6 +785,7 @@ kopper_create_drawable(struct dri_screen *screen, const struct gl_config *visual
drawable->update_tex_buffer = kopper_update_tex_buffer;
drawable->flush_swapbuffers = kopper_flush_swapbuffers;
drawable->swap_buffers = kopper_swap_buffers;
drawable->swap_buffers_with_damage = kopper_swap_buffers_with_damage;
drawable->info.has_alpha = visual->alphaBits > 0;
if (screen->kopper_loader->SetSurfaceCreateInfo)
@ -792,7 +797,7 @@ kopper_create_drawable(struct dri_screen *screen, const struct gl_config *visual
}
static int64_t
kopperSwapBuffers(__DRIdrawable *dPriv, uint32_t flush_flags)
kopperSwapBuffersWithDamage(__DRIdrawable *dPriv, uint32_t flush_flags, int nrects, const int *rects)
{
struct dri_drawable *drawable = dri_drawable(dPriv);
struct dri_context *ctx = dri_get_current();
@ -820,7 +825,18 @@ kopperSwapBuffers(__DRIdrawable *dPriv, uint32_t flush_flags)
__DRI2_FLUSH_DRAWABLE | __DRI2_FLUSH_CONTEXT | flush_flags,
__DRI2_THROTTLE_SWAPBUFFER);
kopper_copy_to_front(ctx->st->pipe, drawable, ptex);
struct pipe_box stack_boxes[64];
if (nrects > ARRAY_SIZE(stack_boxes))
nrects = 0;
if (nrects) {
for (unsigned int i = 0; i < nrects; i++) {
const int *rect = &rects[i * 4];
u_box_2d(rect[0], rect[1], rect[2], rect[3], &stack_boxes[i]);
}
}
kopper_copy_to_front(ctx->st->pipe, drawable, ptex, nrects, stack_boxes);
if (drawable->is_window && !zink_kopper_check(ptex))
return -1;
if (!drawable->textures[ST_ATTACHMENT_FRONT_LEFT]) {
@ -834,10 +850,23 @@ kopperSwapBuffers(__DRIdrawable *dPriv, uint32_t flush_flags)
return 0;
}
static int64_t
kopperSwapBuffers(__DRIdrawable *dPriv, uint32_t flush_flags)
{
return kopperSwapBuffersWithDamage(dPriv, flush_flags, 0, NULL);
}
static void
kopper_swap_buffers_with_damage(struct dri_drawable *drawable, int nrects, const int *rects)
{
kopperSwapBuffersWithDamage(opaque_dri_drawable(drawable), 0, nrects, rects);
}
static void
kopper_swap_buffers(struct dri_drawable *drawable)
{
kopperSwapBuffers(opaque_dri_drawable(drawable), 0);
kopper_swap_buffers_with_damage(drawable, 0, NULL);
}
static __DRIdrawable *
@ -897,6 +926,7 @@ const __DRIkopperExtension driKopperExtension = {
.base = { __DRI_KOPPER, 1 },
.createNewDrawable = kopperCreateNewDrawable,
.swapBuffers = kopperSwapBuffers,
.swapBuffersWithDamage = kopperSwapBuffersWithDamage,
.setSwapInterval = kopperSetSwapInterval,
.queryBufferAge = kopperQueryBufferAge,
};