mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 05:18:08 +02:00
drisw: Modify drisw_swap_buffers_with_damage to swap entire buffer
When swapping buffer with damage regions, to be strictly correct we
need to swap the entire back buffer to the front buffer. This needs to
be done in case the compositor does not support damage regions. This
means we need to ignore the input damage region and tell drisw to swap
the entire buffer.
Cc: mesa-stable
(cherry picked from commit 17ab0f2ece)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39117>
This commit is contained in:
parent
8b3ddaed0b
commit
46155b0576
2 changed files with 9 additions and 21 deletions
|
|
@ -374,7 +374,7 @@
|
|||
"description": "drisw: Modify drisw_swap_buffers_with_damage to swap entire buffer",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": null,
|
||||
"notes": null
|
||||
|
|
|
|||
|
|
@ -225,6 +225,13 @@ drisw_copy_to_front(struct pipe_context *pipe,
|
|||
static void
|
||||
drisw_swap_buffers_with_damage(struct dri_drawable *drawable, int nrects, const int *rects)
|
||||
{
|
||||
/* Damage regions still require us to update the whole front buffer
|
||||
* in case the compositor doesn't obey them, so we will just ignore
|
||||
* the passed in damage regions and swap the whole buffer
|
||||
*/
|
||||
(void)nrects;
|
||||
(void)rects;
|
||||
|
||||
struct dri_context *ctx = dri_get_current();
|
||||
struct dri_screen *screen = drawable->screen;
|
||||
struct pipe_resource *ptex;
|
||||
|
|
@ -242,25 +249,6 @@ drisw_swap_buffers_with_damage(struct dri_drawable *drawable, int nrects, const
|
|||
if (ptex) {
|
||||
struct pipe_fence_handle *fence = NULL;
|
||||
|
||||
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];
|
||||
|
||||
int w = MIN2(rect[2], ptex->width0);
|
||||
int h = MIN2(rect[3], ptex->height0);
|
||||
int x = CLAMP(rect[0], 0, ptex->width0);
|
||||
int y = CLAMP(ptex->height0 - rect[1] - h, 0, ptex->height0);
|
||||
|
||||
if (h > ptex->height0 - y)
|
||||
h = ptex->height0 - y;
|
||||
|
||||
u_box_2d(x, y, w, h, &stack_boxes[i]);
|
||||
}
|
||||
}
|
||||
|
||||
if (ctx->pp)
|
||||
pp_run(ctx->pp, ptex, ptex, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]);
|
||||
|
||||
|
|
@ -279,7 +267,7 @@ drisw_swap_buffers_with_damage(struct dri_drawable *drawable, int nrects, const
|
|||
screen->base.screen->fence_finish(screen->base.screen, ctx->st->pipe,
|
||||
fence, OS_TIMEOUT_INFINITE);
|
||||
screen->base.screen->fence_reference(screen->base.screen, &fence, NULL);
|
||||
drisw_copy_to_front(ctx->st->pipe, drawable, ptex, nrects, nrects ? stack_boxes : NULL);
|
||||
drisw_copy_to_front(ctx->st->pipe, drawable, ptex, 0, NULL);
|
||||
drawable->buffer_age = 1;
|
||||
|
||||
/* TODO: remove this if the framebuffer state doesn't change. */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue