frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: drop symbol COMPOSITE 

FIXME: needs Xnest fixes merged first
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-18 16:05:55 +02:00
parent d6eceee960
commit 3463c0b56e
37 changed files with 0 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Xext/panoramiX.c
View File

@ -54,9 +54,7 @@ Equipment Corporation.
#include "picturestr_priv.h" #include "picturestr_priv.h"
#include "xfixesint.h" #include "xfixesint.h"
#include "damageextint.h" #include "damageextint.h"
#ifdef COMPOSITE
#include "compint.h" #include "compint.h"
#endif
#include "extinit_priv.h" #include "extinit_priv.h"
#include "protocol-versions.h" #include "protocol-versions.h"
@ -583,10 +581,7 @@ PanoramiXExtensionInit(void)
PanoramiXRenderInit(); PanoramiXRenderInit();
PanoramiXFixesInit(); PanoramiXFixesInit();
PanoramiXDamageInit(); PanoramiXDamageInit();
#ifdef COMPOSITE
PanoramiXCompositeInit(); PanoramiXCompositeInit();
#endif
} }
Bool Bool
@ -888,9 +883,7 @@ PanoramiXResetProc(ExtensionEntry * extEntry)
PanoramiXRenderReset(); PanoramiXRenderReset();
PanoramiXFixesReset(); PanoramiXFixesReset();
PanoramiXDamageReset(); PanoramiXDamageReset();
#ifdef COMPOSITE
PanoramiXCompositeReset (); PanoramiXCompositeReset ();
#endif
screenInfo.numScreens = PanoramiXNumScreens; screenInfo.numScreens = PanoramiXNumScreens;
for (i = 256; i--;) for (i = 256; i--;)
ProcVector[i] = SavedProcVector[i]; ProcVector[i] = SavedProcVector[i];

3
Xext/xres.c
View File

@ -31,10 +31,7 @@
#include <string.h> #include <string.h>
#include "hashtable.h" #include "hashtable.h"
#include "picturestr.h" #include "picturestr.h"
#ifdef COMPOSITE
#include "compint.h" #include "compint.h"
#endif
/** @brief Holds fragments of responses for ConstructClientIds. /** @brief Holds fragments of responses for ConstructClientIds.
* *

4
dix/colormap.c
View File

@ -186,12 +186,8 @@ static void FindColorInRootCmap(ColormapPtr /* pmap */ ,
#define NUMRED(vis) ((vis->redMask >> vis->offsetRed) + 1) #define NUMRED(vis) ((vis->redMask >> vis->offsetRed) + 1)
#define NUMGREEN(vis) ((vis->greenMask >> vis->offsetGreen) + 1) #define NUMGREEN(vis) ((vis->greenMask >> vis->offsetGreen) + 1)
#define NUMBLUE(vis) ((vis->blueMask >> vis->offsetBlue) + 1) #define NUMBLUE(vis) ((vis->blueMask >> vis->offsetBlue) + 1)
#if COMPOSITE
#define ALPHAMASK(vis) ((vis)->nplanes < 32 ? 0 : \ #define ALPHAMASK(vis) ((vis)->nplanes < 32 ? 0 : \
(CARD32) ~((vis)->redMask|(vis)->greenMask|(vis)->blueMask)) (CARD32) ~((vis)->redMask|(vis)->greenMask|(vis)->blueMask))
#else
#define ALPHAMASK(vis) 0
#endif
#define RGBMASK(vis) (vis->redMask | vis->greenMask | vis->blueMask | ALPHAMASK(vis)) #define RGBMASK(vis) (vis->redMask | vis->greenMask | vis->blueMask | ALPHAMASK(vis))

2
dix/dispatch.c
View File

@ -2198,10 +2198,8 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin); PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin);
pBoundingDraw = &pPix->drawable; pBoundingDraw = &pPix->drawable;
#if defined(COMPOSITE) || defined(ROOTLESS)
relx -= pPix->screen_x; relx -= pPix->screen_x;
rely -= pPix->screen_y; rely -= pPix->screen_y;
#endif
} }
else { else {
pBoundingDraw = (DrawablePtr) pDraw->pScreen->root; pBoundingDraw = (DrawablePtr) pDraw->pScreen->root;

16
dix/window.c
View File

@ -131,9 +131,7 @@ Equipment Corporation.
#include "dixevents.h" #include "dixevents.h"
#include "globals.h" #include "globals.h"
#include "mi.h" /* miPaintWindow */ #include "mi.h" /* miPaintWindow */
#ifdef COMPOSITE
#include "compint.h" #include "compint.h"
#endif
#include "selection.h" #include "selection.h"
#include "inpututils.h" #include "inpututils.h"
#include "privates.h" #include "privates.h"
@ -188,9 +186,7 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
#define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent)) #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
#ifdef COMPOSITE
static const char *overlay_win_name = "<composite overlay>"; static const char *overlay_win_name = "<composite overlay>";
#endif
static const char * static const char *
get_window_name(WindowPtr pWin) get_window_name(WindowPtr pWin)
@ -200,12 +196,10 @@ get_window_name(WindowPtr pWin)
static char buf[WINDOW_NAME_BUF_LEN]; static char buf[WINDOW_NAME_BUF_LEN];
int len; int len;
#ifdef COMPOSITE
CompScreenPtr comp_screen = GetCompScreen(pWin->drawable.pScreen); CompScreenPtr comp_screen = GetCompScreen(pWin->drawable.pScreen);
if (comp_screen && pWin == comp_screen->pOverlayWin) if (comp_screen && pWin == comp_screen->pOverlayWin)
return overlay_win_name; return overlay_win_name;
#endif
for (prop = wUserProps(pWin); prop; prop = prop->next) { for (prop = wUserProps(pWin); prop; prop = prop->next) {
if (prop->propertyName == XA_WM_NAME && prop->type == XA_STRING && if (prop->propertyName == XA_WM_NAME && prop->type == XA_STRING &&
@ -241,13 +235,11 @@ log_window_info(WindowPtr pWin, int depth)
if (pWin->overrideRedirect) if (pWin->overrideRedirect)
ErrorF(" (override redirect)"); ErrorF(" (override redirect)");
#ifdef COMPOSITE
if (pWin->redirectDraw) if (pWin->redirectDraw)
ErrorF(" (%s compositing: pixmap %x)", ErrorF(" (%s compositing: pixmap %x)",
(pWin->redirectDraw == RedirectDrawAutomatic) ? (pWin->redirectDraw == RedirectDrawAutomatic) ?
"automatic" : "manual", "automatic" : "manual",
(unsigned) pWin->drawable.pScreen->GetWindowPixmap(pWin)->drawable.id); (unsigned) pWin->drawable.pScreen->GetWindowPixmap(pWin)->drawable.id);
#endif
switch (pWin->visibility) { switch (pWin->visibility) {
case VisibilityUnobscured: case VisibilityUnobscured:
@ -508,9 +500,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->forcedBG = FALSE; pWin->forcedBG = FALSE;
pWin->unhittable = FALSE; pWin->unhittable = FALSE;
#ifdef COMPOSITE
pWin->damagedDescendants = FALSE; pWin->damagedDescendants = FALSE;
#endif
} }
static void static void
@ -653,10 +643,8 @@ CreateRootWindow(ScreenPtr pScreen)
pScreen->backingStoreSupport = NotUseful; pScreen->backingStoreSupport = NotUseful;
if (enableBackingStore) if (enableBackingStore)
pScreen->backingStoreSupport = WhenMapped; pScreen->backingStoreSupport = WhenMapped;
#ifdef COMPOSITE
if (noCompositeExtension) if (noCompositeExtension)
pScreen->backingStoreSupport = NotUseful; pScreen->backingStoreSupport = NotUseful;
#endif
pScreen->saveUnderSupport = NotUseful; pScreen->saveUnderSupport = NotUseful;
@ -1718,7 +1706,6 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
void void
SetWinSize(WindowPtr pWin) SetWinSize(WindowPtr pWin)
{ {
#ifdef COMPOSITE
if (pWin->redirectDraw != RedirectDrawNone) { if (pWin->redirectDraw != RedirectDrawNone) {
BoxRec box; BoxRec box;
@ -1733,7 +1720,6 @@ SetWinSize(WindowPtr pWin)
RegionReset(&pWin->winSize, &box); RegionReset(&pWin->winSize, &box);
} }
else else
#endif
ClippedRegionFromBox(pWin->parent, &pWin->winSize, ClippedRegionFromBox(pWin->parent, &pWin->winSize,
pWin->drawable.x, pWin->drawable.y, pWin->drawable.x, pWin->drawable.y,
(int) pWin->drawable.width, (int) pWin->drawable.width,
@ -1756,7 +1742,6 @@ SetBorderSize(WindowPtr pWin)
if (HasBorder(pWin)) { if (HasBorder(pWin)) {
bw = wBorderWidth(pWin); bw = wBorderWidth(pWin);
#ifdef COMPOSITE
if (pWin->redirectDraw != RedirectDrawNone) { if (pWin->redirectDraw != RedirectDrawNone) {
BoxRec box; BoxRec box;
@ -1771,7 +1756,6 @@ SetBorderSize(WindowPtr pWin)
RegionReset(&pWin->borderSize, &box); RegionReset(&pWin->borderSize, &box);
} }
else else
#endif
ClippedRegionFromBox(pWin->parent, &pWin->borderSize, ClippedRegionFromBox(pWin->parent, &pWin->borderSize,
pWin->drawable.x - bw, pWin->drawable.y - bw, pWin->drawable.x - bw, pWin->drawable.y - bw,
(int) (pWin->drawable.width + (bw << 1)), (int) (pWin->drawable.width + (bw << 1)),

2
exa/exa.c
View File

@ -125,13 +125,11 @@ exaGetDrawablePixmap(DrawablePtr pDrawable)
void void
exaGetDrawableDeltas(DrawablePtr pDrawable, PixmapPtr pPixmap, int *xp, int *yp) exaGetDrawableDeltas(DrawablePtr pDrawable, PixmapPtr pPixmap, int *xp, int *yp)
{ {
#if defined(COMPOSITE) || defined(ROOTLESS)
if (pDrawable->type == DRAWABLE_WINDOW) { if (pDrawable->type == DRAWABLE_WINDOW) {
*xp = -pPixmap->screen_x; *xp = -pPixmap->screen_x;
*yp = -pPixmap->screen_y; *yp = -pPixmap->screen_y;
return; return;
} }
#endif
*xp = 0; *xp = 0;
*yp = 0; *yp = 0;

2
exa/exa_accel.c
View File

@ -963,10 +963,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
RegionInit(&rgnDst, NullBox, 0); RegionInit(&rgnDst, NullBox, 0);
RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc); RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);
#if defined(COMPOSITE) || defined(ROOTLESS)
if (pPixmap->screen_x || pPixmap->screen_y) if (pPixmap->screen_x || pPixmap->screen_y)
RegionTranslate(&rgnDst, -pPixmap->screen_x, -pPixmap->screen_y); RegionTranslate(&rgnDst, -pPixmap->screen_x, -pPixmap->screen_y);
#endif
if (pExaScr->fallback_counter) { if (pExaScr->fallback_counter) {
pExaScr->fallback_flags |= EXA_FALLBACK_COPYWINDOW; pExaScr->fallback_flags |= EXA_FALLBACK_COPYWINDOW;

5
fb/fb.h
View File

@ -441,13 +441,8 @@ typedef struct {
#define __fbPixDrawableX(pPix) ((pPix)->drawable.x) #define __fbPixDrawableX(pPix) ((pPix)->drawable.x)
#define __fbPixDrawableY(pPix) ((pPix)->drawable.y) #define __fbPixDrawableY(pPix) ((pPix)->drawable.y)
#if defined(COMPOSITE) || defined(ROOTLESS)
#define __fbPixOffXWin(pPix) (__fbPixDrawableX(pPix) - (pPix)->screen_x) #define __fbPixOffXWin(pPix) (__fbPixDrawableX(pPix) - (pPix)->screen_x)
#define __fbPixOffYWin(pPix) (__fbPixDrawableY(pPix) - (pPix)->screen_y) #define __fbPixOffYWin(pPix) (__fbPixDrawableY(pPix) - (pPix)->screen_y)
#else
#define __fbPixOffXWin(pPix) (__fbPixDrawableX(pPix))
#define __fbPixOffYWin(pPix) (__fbPixDrawableY(pPix))
#endif
#define __fbPixOffXPix(pPix) (__fbPixDrawableX(pPix)) #define __fbPixOffXPix(pPix) (__fbPixDrawableX(pPix))
#define __fbPixOffYPix(pPix) (__fbPixDrawableY(pPix)) #define __fbPixOffYPix(pPix) (__fbPixDrawableY(pPix))

2
fb/fbpixmap.c
View File

@ -76,10 +76,8 @@ fbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
fbInitializeDrawable(&pPixmap->drawable); fbInitializeDrawable(&pPixmap->drawable);
#endif #endif
#if defined(COMPOSITE) || defined(ROOTLESS)
pPixmap->screen_x = 0; pPixmap->screen_x = 0;
pPixmap->screen_y = 0; pPixmap->screen_y = 0;
#endif
pPixmap->usage_hint = usage_hint; pPixmap->usage_hint = usage_hint;

2
fb/fbwindow.c
View File

@ -116,10 +116,8 @@ fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc); RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);
#if defined(COMPOSITE) || defined(ROOTLESS)
if (pPixmap->screen_x || pPixmap->screen_y) if (pPixmap->screen_x || pPixmap->screen_y)
RegionTranslate(&rgnDst, -pPixmap->screen_x, -pPixmap->screen_y); RegionTranslate(&rgnDst, -pPixmap->screen_x, -pPixmap->screen_y);
#endif
miCopyRegion(pDrawable, pDrawable, miCopyRegion(pDrawable, pDrawable,
0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); 0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);

2
glamor/glamor_copy.c
View File

@ -781,10 +781,8 @@ glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_regio
RegionIntersect(&dst_region, &window->borderClip, src_region); RegionIntersect(&dst_region, &window->borderClip, src_region);
#if defined(COMPOSITE) || defined(ROOTLESS)
if (pixmap->screen_x || pixmap->screen_y) if (pixmap->screen_x || pixmap->screen_y)
RegionTranslate(&dst_region, -pixmap->screen_x, -pixmap->screen_y); RegionTranslate(&dst_region, -pixmap->screen_x, -pixmap->screen_y);
#endif
miCopyRegion(drawable, drawable, miCopyRegion(drawable, drawable,
0, &dst_region, dx, dy, glamor_copy, 0, 0); 0, &dst_region, dx, dy, glamor_copy, 0, 0);

2
glamor/glamor_pixmap.c
View File

@ -39,13 +39,11 @@ void
glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap, glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
int *x, int *y) int *x, int *y)
{ {
#if defined(COMPOSITE) || defined(ROOTLESS)
if (drawable->type == DRAWABLE_WINDOW) { if (drawable->type == DRAWABLE_WINDOW) {
*x = -pixmap->screen_x; *x = -pixmap->screen_x;
*y = -pixmap->screen_y; *y = -pixmap->screen_y;
return; return;
} }
#endif
*x = 0; *x = 0;
*y = 0; *y = 0;

4
glx/glxdricommon.c
View File

@ -204,7 +204,6 @@ createModeFromConfig(const __DRIcoreExtension * core,
config->config.drawableType = drawableType; config->config.drawableType = drawableType;
config->config.yInverted = GL_TRUE; config->config.yInverted = GL_TRUE;
#ifdef COMPOSITE
if (!noCompositeExtension) { if (!noCompositeExtension) {
/* /*
* Here we decide what fbconfigs will be duplicated for compositing. * Here we decide what fbconfigs will be duplicated for compositing.
@ -229,7 +228,6 @@ createModeFromConfig(const __DRIcoreExtension * core,
config->config.duplicatedForComp = duplicateForComp; config->config.duplicatedForComp = duplicateForComp;
} }
#endif
return &config->config; return &config->config;
} }
@ -261,7 +259,6 @@ glxConvertConfigs(const __DRIcoreExtension * core,
tail = tail->next; tail = tail->next;
} }
#ifdef COMPOSITE
if (!noCompositeExtension) { if (!noCompositeExtension) {
/* Duplicate fbconfigs for use with compositing visuals */ /* Duplicate fbconfigs for use with compositing visuals */
for (i = 0; configs[i]; i++) { for (i = 0; configs[i]; i++) {
@ -273,7 +270,6 @@ glxConvertConfigs(const __DRIcoreExtension * core,
tail = tail->next; tail = tail->next;
} }
} }
#endif
return head.next; return head.next;
} }

11
glx/glxscreens.c
View File

@ -44,10 +44,7 @@
#include "glxutil.h" #include "glxutil.h"
#include "glxext.h" #include "glxext.h"
#include "protocol-versions.h" #include "protocol-versions.h"
#ifdef COMPOSITE
#include "compositeext.h" #include "compositeext.h"
#endif
static DevPrivateKeyRec glxScreenPrivateKeyRec; static DevPrivateKeyRec glxScreenPrivateKeyRec;
@ -280,14 +277,12 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
/* Can't use the same FBconfig for multiple X visuals. I think. */ /* Can't use the same FBconfig for multiple X visuals. I think. */
if (config->visualID != 0) if (config->visualID != 0)
continue; continue;
#ifdef COMPOSITE
if (!noCompositeExtension) { if (!noCompositeExtension) {
/* Use only duplicated configs for compIsAlternateVisuals */ /* Use only duplicated configs for compIsAlternateVisuals */
if (!!compIsAlternateVisual(pGlxScreen->pScreen, visual->vid) != if (!!compIsAlternateVisual(pGlxScreen->pScreen, visual->vid) !=
!!config->duplicatedForComp) !!config->duplicatedForComp)
continue; continue;
} }
#endif
/* /*
* If possible, use the same swapmethod for all built-in visual * If possible, use the same swapmethod for all built-in visual
* fbconfigs, to avoid getting the 32-bit composite visual when * fbconfigs, to avoid getting the 32-bit composite visual when
@ -355,12 +350,10 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
if (config) { if (config) {
pGlxScreen->visuals[pGlxScreen->numVisuals++] = config; pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
config->visualID = visual->vid; config->visualID = visual->vid;
#ifdef COMPOSITE
if (!noCompositeExtension) { if (!noCompositeExtension) {
if (compIsAlternateVisual(pScreen, visual->vid)) if (compIsAlternateVisual(pScreen, visual->vid))
config->visualSelectGroup++; config->visualSelectGroup++;
} }
#endif
} }
} }
@ -380,14 +373,12 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
* set up above is for. * set up above is for.
*/ */
depth = config->redBits + config->greenBits + config->blueBits; depth = config->redBits + config->greenBits + config->blueBits;
#ifdef COMPOSITE
if (!noCompositeExtension) { if (!noCompositeExtension) {
if (config->duplicatedForComp) { if (config->duplicatedForComp) {
depth += config->alphaBits; depth += config->alphaBits;
config->visualSelectGroup++; config->visualSelectGroup++;
} }
} }
#endif
/* Make sure that our FBconfig's depth can actually be displayed /* Make sure that our FBconfig's depth can actually be displayed
* (corresponds to an existing visual). * (corresponds to an existing visual).
*/ */
@ -410,12 +401,10 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
if (visual == NULL) if (visual == NULL)
continue; continue;
#ifdef COMPOSITE
if (!noCompositeExtension) { if (!noCompositeExtension) {
if (config->duplicatedForComp) if (config->duplicatedForComp)
(void) CompositeRegisterAlternateVisuals(pScreen, &visual->vid, 1); (void) CompositeRegisterAlternateVisuals(pScreen, &visual->vid, 1);
} }
#endif
pGlxScreen->visuals[pGlxScreen->numVisuals++] = config; pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
initGlxVisual(visual, config); initGlxVisual(visual, config);
} }

2
glx/glxscreens.h
View File

@ -42,9 +42,7 @@ typedef struct __GLXconfig __GLXconfig;
struct __GLXconfig { struct __GLXconfig {
/* Management */ /* Management */
__GLXconfig *next; __GLXconfig *next;
#ifdef COMPOSITE
GLboolean duplicatedForComp; GLboolean duplicatedForComp;
#endif
GLuint doubleBufferMode; GLuint doubleBufferMode;
GLuint stereoMode; GLuint stereoMode;

2
hw/vfb/InitOutput.c
View File

@ -343,9 +343,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
if (strcmp(argv[i], "-render") == 0) { /* -render */ if (strcmp(argv[i], "-render") == 0) { /* -render */
Render = FALSE; Render = FALSE;
#ifdef COMPOSITE
noCompositeExtension = TRUE; noCompositeExtension = TRUE;
#endif
return 1; return 1;
} }

2
hw/xfree86/common/xf86Helper.c
View File

@ -1567,11 +1567,9 @@ xf86SetBackingStore(ScreenPtr pScreen)
else { else {
if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS)) if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))
from = X_CONFIG; from = X_CONFIG;
#ifdef COMPOSITE
if (from != X_CONFIG) if (from != X_CONFIG)
useBS = xf86ReturnOptValBool(options, OPTION_BACKING_STORE, useBS = xf86ReturnOptValBool(options, OPTION_BACKING_STORE,
!noCompositeExtension); !noCompositeExtension);
#endif
} }
free(options); free(options);
pScreen->backingStoreSupport = useBS ? WhenMapped : NotUseful; pScreen->backingStoreSupport = useBS ? WhenMapped : NotUseful;

4
hw/xfree86/dri2/dri2.c
View File

@ -872,10 +872,8 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
return NULL; return NULL;
pPriv->prime_secondary_pixmap = spix; pPriv->prime_secondary_pixmap = spix;
#ifdef COMPOSITE
spix->screen_x = mpix->screen_x; spix->screen_x = mpix->screen_x;
spix->screen_y = mpix->screen_y; spix->screen_y = mpix->screen_y;
#endif
DRI2InvalidateDrawableAll(pDraw); DRI2InvalidateDrawableAll(pDraw);
return &spix->drawable; return &spix->drawable;
@ -963,9 +961,7 @@ DRI2CanFlip(DrawablePtr pDraw)
/* Does the window match the pixmap exactly? */ /* Does the window match the pixmap exactly? */
if (pDraw->x != 0 || pDraw->y != 0 || if (pDraw->x != 0 || pDraw->y != 0 ||
#ifdef COMPOSITE
pDraw->x != pWinPixmap->screen_x || pDraw->y != pWinPixmap->screen_y || pDraw->x != pWinPixmap->screen_x || pDraw->y != pWinPixmap->screen_y ||
#endif
pDraw->width != pWinPixmap->drawable.width || pDraw->width != pWinPixmap->drawable.width ||
pDraw->height != pWinPixmap->drawable.height) pDraw->height != pWinPixmap->drawable.height)
return FALSE; return FALSE;

2
hw/xfree86/drivers/modesetting/dri2.c
View File

@ -291,11 +291,9 @@ ms_dri2_copy_region2(ScreenPtr screen, DrawablePtr drawable, RegionPtr pRegion,
} }
if (translate && drawable->type == DRAWABLE_WINDOW) { if (translate && drawable->type == DRAWABLE_WINDOW) {
#ifdef COMPOSITE
PixmapPtr pixmap = get_drawable_pixmap(drawable); PixmapPtr pixmap = get_drawable_pixmap(drawable);
off_x = -pixmap->screen_x; off_x = -pixmap->screen_x;
off_y = -pixmap->screen_y; off_y = -pixmap->screen_y;
#endif
off_x += drawable->x; off_x += drawable->x;
off_y += drawable->y; off_y += drawable->y;
} }

2
hw/xfree86/sdksyms.sh
View File

@ -213,9 +213,7 @@ cat > sdksyms.c << EOF
#include "exa.h" #include "exa.h"
*/ */
#ifdef COMPOSITE
#include "compositeext.h" #include "compositeext.h"
#endif
/* xfixes/Makefile.am */ /* xfixes/Makefile.am */
#include "xfixes.h" #include "xfixes.h"

5
hw/xquartz/mach-startup/bundle-main.c
View File

@ -74,10 +74,7 @@ extern void
FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN; FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
extern int noPanoramiXExtension; extern int noPanoramiXExtension;
#ifdef COMPOSITE
extern Bool noCompositeExtension; extern Bool noCompositeExtension;
#endif
#define DEFAULT_CLIENT X11BINDIR "/xterm" #define DEFAULT_CLIENT X11BINDIR "/xterm"
#define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz" #define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz"
@ -642,10 +639,8 @@ main(int argc, char **argv, char **envp)
/* The server must not run the PanoramiX operations. */ /* The server must not run the PanoramiX operations. */
noPanoramiXExtension = TRUE; noPanoramiXExtension = TRUE;
#ifdef COMPOSITE
/* https://gitlab.freedesktop.org/xorg/xserver/-/issues/1409 */ /* https://gitlab.freedesktop.org/xorg/xserver/-/issues/1409 */
noCompositeExtension = TRUE; noCompositeExtension = TRUE;
#endif
/* Setup the initial crasherporter info */ /* Setup the initial crasherporter info */
strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, strlcpy(__crashreporter_info_buff__, __crashreporter_info__base,

2
hw/xwayland/xwayland-present.c
View File

@ -1111,10 +1111,8 @@ retry:
PixmapPtr old_pixmap = screen->GetWindowPixmap(window); PixmapPtr old_pixmap = screen->GetWindowPixmap(window);
/* Replace window pixmap with flip pixmap */ /* Replace window pixmap with flip pixmap */
#ifdef COMPOSITE
vblank->pixmap->screen_x = old_pixmap->screen_x; vblank->pixmap->screen_x = old_pixmap->screen_x;
vblank->pixmap->screen_y = old_pixmap->screen_y; vblank->pixmap->screen_y = old_pixmap->screen_y;
#endif
present_set_tree_pixmap(toplvl_window, old_pixmap, vblank->pixmap); present_set_tree_pixmap(toplvl_window, old_pixmap, vblank->pixmap);
if (toplvl_window == screen->root && if (toplvl_window == screen->root &&

2
hw/xwayland/xwayland-window-buffers.c
View File

@ -310,10 +310,8 @@ xwl_window_set_pixmap(WindowPtr window, PixmapPtr pixmap)
visit.old = screen->GetWindowPixmap(window); visit.old = screen->GetWindowPixmap(window);
visit.new = pixmap; visit.new = pixmap;
#ifdef COMPOSITE
pixmap->screen_x = visit.old->screen_x; pixmap->screen_x = visit.old->screen_x;
pixmap->screen_y = visit.old->screen_y; pixmap->screen_y = visit.old->screen_y;
#endif
TraverseTree(window, xwl_set_pixmap_visit_window, &visit); TraverseTree(window, xwl_set_pixmap_visit_window, &visit);

2
hw/xwayland/xwayland-window.c
View File

@ -259,10 +259,8 @@ xwl_source_validate(DrawablePtr drawable, int x, int y, int width, int height,
if (!RegionNotEmpty(xwl_window->surface_window_damage)) if (!RegionNotEmpty(xwl_window->surface_window_damage))
need_source_validate_dec(xwl_window->xwl_screen); need_source_validate_dec(xwl_window->xwl_screen);
#if defined(COMPOSITE)
if (dst_pix->screen_x || dst_pix->screen_y) if (dst_pix->screen_x || dst_pix->screen_y)
RegionTranslate(&region, -dst_pix->screen_x, -dst_pix->screen_y); RegionTranslate(&region, -dst_pix->screen_x, -dst_pix->screen_y);
#endif
pbox = RegionRects(&region); pbox = RegionRects(&region);
nbox = RegionNumRects(&region); nbox = RegionNumRects(&region);

2
hw/xwin/winmultiwindowwindow.c
View File

@ -1071,10 +1071,8 @@ winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth,
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
pPixmap->devPrivate.ptr = NULL; // later set to pbBits pPixmap->devPrivate.ptr = NULL; // later set to pbBits
pPixmap->primary_pixmap = NULL; pPixmap->primary_pixmap = NULL;
#ifdef COMPOSITE
pPixmap->screen_x = 0; pPixmap->screen_x = 0;
pPixmap->screen_y = 0; pPixmap->screen_y = 0;
#endif
pPixmap->usage_hint = usage_hint; pPixmap->usage_hint = usage_hint;
/* Check for zero width or height pixmaps */ /* Check for zero width or height pixmaps */

2
hw/xwin/winshadgdi.c
View File

@ -828,7 +828,6 @@ winBltExposedWindowRegionShadowGDI(ScreenPtr pScreen, WindowPtr pWin)
return 0; return 0;
} }
#ifdef COMPOSITE
if (pWin->redirectDraw != RedirectDrawNone) { if (pWin->redirectDraw != RedirectDrawNone) {
HBITMAP hBitmap; HBITMAP hBitmap;
HDC hdcPixmap; HDC hdcPixmap;
@ -870,7 +869,6 @@ winBltExposedWindowRegionShadowGDI(ScreenPtr pScreen, WindowPtr pWin)
DeleteDC(hdcPixmap); DeleteDC(hdcPixmap);
} }
else else
#endif
{ {
/* Try to copy from the shadow buffer to the invalidated region */ /* Try to copy from the shadow buffer to the invalidated region */
if (!BitBlt(hdcUpdate, if (!BitBlt(hdcUpdate,

2
include/extinit.h
View File

@ -53,9 +53,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "extnsionst.h" #include "extnsionst.h"
#ifdef COMPOSITE
extern _X_EXPORT Bool noCompositeExtension; extern _X_EXPORT Bool noCompositeExtension;
#endif
#ifdef DAMAGE #ifdef DAMAGE
extern _X_EXPORT Bool noDamageExtension; extern _X_EXPORT Bool noDamageExtension;

1
include/meson.build
View File

@ -199,7 +199,6 @@ endif
conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false) conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false)
conf_data.set('IPv6', build_ipv6 ? '1' : false) conf_data.set('IPv6', build_ipv6 ? '1' : false)
conf_data.set('COMPOSITE', '1')
conf_data.set('DAMAGE', '1') conf_data.set('DAMAGE', '1')
conf_data.set('DBE', '1') conf_data.set('DBE', '1')
conf_data.set('DGA', build_dga ? '1' : false) conf_data.set('DGA', build_dga ? '1' : false)

2
include/pixmapstr.h
View File

@ -78,10 +78,8 @@ typedef struct _Pixmap {
int refcnt; int refcnt;
int devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */ int devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */
DevUnion devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */ DevUnion devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */
#if defined(COMPOSITE) || defined(ROOTLESS)
short screen_x; short screen_x;
short screen_y; short screen_y;
#endif
unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */ unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */
PixmapPtr primary_pixmap; /* pointer to primary copy of pixmap for pixmap sharing */ PixmapPtr primary_pixmap; /* pointer to primary copy of pixmap for pixmap sharing */

2
include/windowstr.h
View File

@ -161,10 +161,8 @@ typedef struct _Window {
unsigned redirectDraw:2; /* COMPOSITE rendering redirect */ unsigned redirectDraw:2; /* COMPOSITE rendering redirect */
unsigned forcedBG:1; /* must have an opaque background */ unsigned forcedBG:1; /* must have an opaque background */
unsigned unhittable:1; /* doesn't hit-test, for rootless */ unsigned unhittable:1; /* doesn't hit-test, for rootless */
#ifdef COMPOSITE
unsigned damagedDescendants:1; /* some descendants are damaged */ unsigned damagedDescendants:1; /* some descendants are damaged */
unsigned inhibitBGPaint:1; /* paint the background? */ unsigned inhibitBGPaint:1; /* paint the background? */
#endif
} WindowRec; } WindowRec;
/* /*

11
mi/miexpose.c
View File

@ -407,9 +407,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
BoxPtr pbox; BoxPtr pbox;
xRectangle *prect; xRectangle *prect;
int numRects, regionnumrects; int numRects, regionnumrects;
#ifdef COMPOSITE
WindowPtr orig_pWin = pWin; WindowPtr orig_pWin = pWin;
#endif
/* /*
* Distance from screen to destination drawable, use this * Distance from screen to destination drawable, use this
@ -436,10 +434,8 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
tile_x_off = pWin->drawable.x - draw_x_off; tile_x_off = pWin->drawable.x - draw_x_off;
tile_y_off = pWin->drawable.y - draw_y_off; tile_y_off = pWin->drawable.y - draw_y_off;
fill = pWin->background; fill = pWin->background;
#ifdef COMPOSITE
if (pWin->inhibitBGPaint) if (pWin->inhibitBGPaint)
return; return;
#endif
switch (pWin->backgroundState) { switch (pWin->backgroundState) {
case None: case None:
return; return;
@ -466,15 +462,10 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
tile_x_off = pWin->drawable.x; tile_x_off = pWin->drawable.x;
tile_y_off = pWin->drawable.y; tile_y_off = pWin->drawable.y;
#if defined(COMPOSITE) || defined(ROOTLESS)
draw_x_off = pixmap->screen_x; draw_x_off = pixmap->screen_x;
draw_y_off = pixmap->screen_y; draw_y_off = pixmap->screen_y;
tile_x_off -= draw_x_off; tile_x_off -= draw_x_off;
tile_y_off -= draw_y_off; tile_y_off -= draw_y_off;
#else
draw_x_off = 0;
draw_y_off = 0;
#endif
} }
gcval[0].val = GXcopy; gcval[0].val = GXcopy;
@ -493,7 +484,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
gcval[1].val = gcval[1].val =
fill.pixel | RootlessAlphaMask(pWin->drawable.bitsPerPixel); fill.pixel | RootlessAlphaMask(pWin->drawable.bitsPerPixel);
#else #else
#ifdef COMPOSITE
/* Make sure alpha will sample as 1.0 for opaque windows */ /* Make sure alpha will sample as 1.0 for opaque windows */
if (drawable->depth == 32) { if (drawable->depth == 32) {
int effective_depth = orig_pWin->drawable.depth; int effective_depth = orig_pWin->drawable.depth;
@ -513,7 +503,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
if (effective_depth == 24) if (effective_depth == 24)
fill.pixel |= 0xff000000; fill.pixel |= 0xff000000;
} }
#endif
gcval[1].val = fill.pixel; gcval[1].val = fill.pixel;
#endif #endif
gcval[2].val = FillSolid; gcval[2].val = FillSolid;

2
mi/miinitext.c
View File

@ -125,9 +125,7 @@ static const ExtensionModule staticExtensions[] = {
#ifdef RANDR #ifdef RANDR
{RRExtensionInit, "RANDR", &noRRExtension}, {RRExtensionInit, "RANDR", &noRRExtension},
#endif #endif
#ifdef COMPOSITE
{CompositeExtensionInit, "COMPOSITE", &noCompositeExtension}, {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension},
#endif
#ifdef DAMAGE #ifdef DAMAGE
{DamageExtensionInit, "DAMAGE", &noDamageExtension}, {DamageExtensionInit, "DAMAGE", &noDamageExtension},
#endif #endif

10
mi/mivaltree.c
View File

@ -100,9 +100,7 @@ Equipment Corporation.
#include "regionstr.h" #include "regionstr.h"
#include "mivalidate.h" #include "mivalidate.h"
#include "globals.h" #include "globals.h"
#ifdef COMPOSITE
#include "compint.h" #include "compint.h"
#endif
/* /*
* Compute the visibility of a shaped window * Compute the visibility of a shaped window
@ -167,11 +165,7 @@ miShapedWindowIn(RegionPtr universe, RegionPtr bounding,
* siblings or parent windows * siblings or parent windows
*/ */
#ifdef COMPOSITE
#define TreatAsTransparent(w) ((w)->redirectDraw == RedirectDrawManual) #define TreatAsTransparent(w) ((w)->redirectDraw == RedirectDrawManual)
#else
#define TreatAsTransparent(w) FALSE
#endif
#define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \ #define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
HasBorder(w) && \ HasBorder(w) && \
@ -228,7 +222,6 @@ miComputeClips(WindowPtr pParent,
dy = 32767; dy = 32767;
borderSize.y2 = dy; borderSize.y2 = dy;
#ifdef COMPOSITE
/* /*
* In redirected drawing case, reset universe to borderSize * In redirected drawing case, reset universe to borderSize
*/ */
@ -238,7 +231,6 @@ miComputeClips(WindowPtr pParent,
compSetRedirectBorderClip (pParent, universe); compSetRedirectBorderClip (pParent, universe);
RegionCopy(universe, &pParent->borderSize); RegionCopy(universe, &pParent->borderSize);
} }
#endif
oldVis = pParent->visibility; oldVis = pParent->visibility;
switch (RegionContainsRect(universe, &borderSize)) { switch (RegionContainsRect(universe, &borderSize)) {
@ -508,11 +500,9 @@ miTreeObscured(WindowPtr pParent)
static RegionPtr static RegionPtr
getBorderClip(WindowPtr pWin) getBorderClip(WindowPtr pWin)
{ {
#ifdef COMPOSITE
if (pWin->redirectDraw != RedirectDrawNone) if (pWin->redirectDraw != RedirectDrawNone)
return compGetRedirectBorderClip(pWin); return compGetRedirectBorderClip(pWin);
else else
#endif
return &pWin->borderClip; return &pWin->borderClip;
} }

4
mi/miwindow.c
View File

@ -317,7 +317,6 @@ miRecomputeExposures(WindowPtr pWin, void *value)
RegionPtr pValid = (RegionPtr) value; RegionPtr pValid = (RegionPtr) value;
if (pWin->valdata) { if (pWin->valdata) {
#ifdef COMPOSITE
/* /*
* Redirected windows are not affected by parent window * Redirected windows are not affected by parent window
* gravity manipulations, so don't recompute their * gravity manipulations, so don't recompute their
@ -325,7 +324,6 @@ miRecomputeExposures(WindowPtr pWin, void *value)
*/ */
if (pWin->redirectDraw != RedirectDrawNone) if (pWin->redirectDraw != RedirectDrawNone)
return WT_DONTWALKCHILDREN; return WT_DONTWALKCHILDREN;
#endif
/* /*
* compute exposed regions of this window * compute exposed regions of this window
*/ */
@ -570,9 +568,7 @@ miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w, unsigned int h,
/* and move those bits */ /* and move those bits */
if (oldpt.x != x || oldpt.y != y if (oldpt.x != x || oldpt.y != y
#ifdef COMPOSITE
|| pWin->redirectDraw || pWin->redirectDraw
#endif
) { ) {
(*pWin->drawable.pScreen->CopyWindow) (pWin, oldpt, (*pWin->drawable.pScreen->CopyWindow) (pWin, oldpt,
gravitate[g]); gravitate[g]);

8
miext/damage/damage.c
View File

@ -145,15 +145,12 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
RegionRec pixClip; RegionRec pixClip;
int draw_x, draw_y; int draw_x, draw_y;
#if defined(COMPOSITE) || defined(ROOTLESS)
int screen_x = 0, screen_y = 0; int screen_x = 0, screen_y = 0;
#endif
/* short circuit for empty regions */ /* short circuit for empty regions */
if (!RegionNotEmpty(pRegion)) if (!RegionNotEmpty(pRegion))
return; return;
#if defined(COMPOSITE) || defined(ROOTLESS)
/* /*
* When drawing to a pixmap which is storing window contents, * When drawing to a pixmap which is storing window contents,
* the region presented is in pixmap relative coordinates which * the region presented is in pixmap relative coordinates which
@ -165,7 +162,6 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
} }
if (screen_x || screen_y) if (screen_x || screen_y)
RegionTranslate(pRegion, screen_x, screen_y); RegionTranslate(pRegion, screen_x, screen_y);
#endif
if (pDrawable->type == DRAWABLE_WINDOW && if (pDrawable->type == DRAWABLE_WINDOW &&
((WindowPtr) (pDrawable))->backingStore == NotUseful) { ((WindowPtr) (pDrawable))->backingStore == NotUseful) {
@ -204,7 +200,6 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
draw_x = pDamage->pDrawable->x; draw_x = pDamage->pDrawable->x;
draw_y = pDamage->pDrawable->y; draw_y = pDamage->pDrawable->y;
#if defined(COMPOSITE) || defined(ROOTLESS)
/* /*
* Need to move everyone to screen coordinates * Need to move everyone to screen coordinates
* XXX what about off-screen pixmaps with non-zero x/y? * XXX what about off-screen pixmaps with non-zero x/y?
@ -213,7 +208,6 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
draw_x += ((PixmapPtr) pDamage->pDrawable)->screen_x; draw_x += ((PixmapPtr) pDamage->pDrawable)->screen_x;
draw_y += ((PixmapPtr) pDamage->pDrawable)->screen_y; draw_y += ((PixmapPtr) pDamage->pDrawable)->screen_y;
} }
#endif
/* /*
* Clip against border or pixmap bounds * Clip against border or pixmap bounds
@ -277,10 +271,8 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
if (pDamageRegion == pRegion && (draw_x || draw_y)) if (pDamageRegion == pRegion && (draw_x || draw_y))
RegionTranslate(pDamageRegion, draw_x, draw_y); RegionTranslate(pDamageRegion, draw_x, draw_y);
} }
#if defined(COMPOSITE) || defined(ROOTLESS)
if (screen_x || screen_y) if (screen_x || screen_y)
RegionTranslate(pRegion, -screen_x, -screen_y); RegionTranslate(pRegion, -screen_x, -screen_y);
#endif
RegionUninit(&clippedRec); RegionUninit(&clippedRec);
} }

2
os/utils.c
View File

@ -120,9 +120,7 @@ __stdcall unsigned long GetTickCount(void);
Bool noTestExtensions; Bool noTestExtensions;
#ifdef COMPOSITE
Bool noCompositeExtension = FALSE; Bool noCompositeExtension = FALSE;
#endif
#ifdef DAMAGE #ifdef DAMAGE
Bool noDamageExtension = FALSE; Bool noDamageExtension = FALSE;

2
present/present_scmd.c
View File

@ -134,9 +134,7 @@ present_check_flip(RRCrtcPtr crtc,
/* Does the window match the pixmap exactly? */ /* Does the window match the pixmap exactly? */
if (window->drawable.x != 0 || window->drawable.y != 0 || if (window->drawable.x != 0 || window->drawable.y != 0 ||
#if defined(COMPOSITE) || defined(ROOTLESS)
window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y || window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y ||
#endif
window->drawable.width != pixmap->drawable.width || window->drawable.width != pixmap->drawable.width ||
window->drawable.height != pixmap->drawable.height) { window->drawable.height != pixmap->drawable.height) {
return FALSE; return FALSE;