Attachment 81263 Details for Bug 64940 – Invalidate DRI2Buffers upon SetPixmap

[patch] Invalidate DRI2Buffers upon SetPixmap

0001-dri2-Invalidate-DRI2Buffers-upon-SetWindowPixmap-upd.patch (text/plain), 2.55 KB, created by Chris Wilson on 2013-06-23 10:46:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-06-23 10:46:07 UTC

Size: 2.55 KB

patch

obsolete

>From f2ce3c7c9f529e0907264dbe5f72d0cc471df0b8 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sun, 30 Sep 2012 10:36:14 +0100
>Subject: [PATCH] dri2: Invalidate DRI2Buffers upon SetWindowPixmap updates
>
>When transitioning to a redirected or unredirected Window, the Composite
>layer modifies the Window's Pixmap. However, the DRI2Buffer for the
>Drawable is still pointing to the backing bo of the old Pixmap with the
>result that rendering goes astray.
>
>v2: Fixup the function name after rebasing
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Reinis Danne <reinis.danne@gmail.com>
>---
> hw/xfree86/dri2/dri2.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
>diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
>index 83146f5..10c7d88 100644
>--- a/hw/xfree86/dri2/dri2.c
>+++ b/hw/xfree86/dri2/dri2.c
>@@ -130,6 +130,7 @@ typedef struct _DRI2Screen {
>     HandleExposuresProcPtr HandleExposures;
> 
>     ConfigNotifyProcPtr ConfigNotify;
>+    SetWindowPixmapProcPtr SetWindowPixmap;
>     DRI2CreateBuffer2ProcPtr CreateBuffer2;
>     DRI2DestroyBuffer2ProcPtr DestroyBuffer2;
>     DRI2CopyRegion2ProcPtr CopyRegion2;
>@@ -1387,6 +1388,21 @@ DRI2ConfigNotify(WindowPtr pWin, int x, int y, int w, int h, int bw,
>     return Success;
> }
> 
>+static void
>+DRI2SetWindowPixmap(WindowPtr pWin, PixmapPtr pPix)
>+{
>+    DrawablePtr pDraw = (DrawablePtr) pWin;
>+    ScreenPtr pScreen = pDraw->pScreen;
>+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
>+
>+    pScreen->SetWindowPixmap = ds->SetWindowPixmap;
>+    (*pScreen->SetWindowPixmap) (pWin, pPix);
>+    ds->SetWindowPixmap = pScreen->SetWindowPixmap;
>+    pScreen->SetWindowPixmap = DRI2SetWindowPixmap;
>+
>+    DRI2InvalidateDrawableAll(pDraw);
>+}
>+
> #define MAX_PRIME DRI2DriverPrimeMask
> static int
> get_prime_id(void)
>@@ -1533,6 +1549,9 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
>     ds->ConfigNotify = pScreen->ConfigNotify;
>     pScreen->ConfigNotify = DRI2ConfigNotify;
> 
>+    ds->SetWindowPixmap = pScreen->SetWindowPixmap;
>+    pScreen->SetWindowPixmap = DRI2SetWindowPixmap;
>+
>     xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");
>     for (i = 0; i < sizeof(driverTypeNames) / sizeof(driverTypeNames[0]); i++) {
>         if (i < ds->numDrivers && ds->driverNames[i]) {
>@@ -1557,6 +1576,7 @@ DRI2CloseScreen(ScreenPtr pScreen)
>     DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
> 
>     pScreen->ConfigNotify = ds->ConfigNotify;
>+    pScreen->SetWindowPixmap = ds->SetWindowPixmap;
> 
>     if (ds->prime_id)
>         prime_id_allocate_bitmask &= ~(1 << ds->prime_id);
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 64940: 81263

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.