From d4be5688639a61ae6ed8f4e5006fbd26d733506b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Thu, 30 Oct 2025 16:37:22 +0100
Subject: [PATCH] Revert "composite: Only copy bits from the parent pixmap when
 absolutely necessary"

This reverts commit 7e6c55cc9f5f26ef8afa74b2e86e883ce2ec1163.

In the pParent->drawable.depth == pWin->drawable.depth case, pWin may
already have valid contents, which need to be copied to the new pixmap.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2092>
---
 composite/compalloc.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composite/compalloc.c b/composite/compalloc.c
index 51a538487..63b3059e9 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -544,9 +544,6 @@ compNewPixmap(WindowPtr pWin, int x, int y, int w, int h)
     pPixmap->screen_x = x;
     pPixmap->screen_y = y;
 
-    if (pWin->backgroundState != None)
-        return pPixmap;
-
     if (pParent->drawable.depth == pWin->drawable.depth) {
         GCPtr pGC = GetScratchGC(pWin->drawable.depth, pScreen);