From 850aebf5bcdaf4510cdba5766db97650b705b565 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 9 Sep 2025 19:26:57 +0200 Subject: [PATCH] xwin: use screenInfo insead of pointer passed to InitOutput() We only have one global screenInfo struct ever, and many other parts of the Xserver can only operate on global screenInfo, so it's time to phase out this extra pointer. Once the same has done on the other DDXes, it will be dropped from InitOutput()'s parameter list. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xwin/InitOutput.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index cf873c31b..2ff398297 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -821,15 +821,15 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) LoadPreferences(); /* Setup global screen info parameters */ - pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER; - pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD; - pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT; - pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER; - pScreenInfo->numPixmapFormats = ARRAY_SIZE(g_PixmapFormats); + screenInfo.imageByteOrder = IMAGE_BYTE_ORDER; + screenInfo.bitmapScanlinePad = BITMAP_SCANLINE_PAD; + screenInfo.bitmapScanlineUnit = BITMAP_SCANLINE_UNIT; + screenInfo.bitmapBitOrder = BITMAP_BIT_ORDER; + screenInfo.numPixmapFormats = ARRAY_SIZE(g_PixmapFormats); /* Describe how we want common pixmap formats padded */ for (i = 0; i < ARRAY_SIZE(g_PixmapFormats); i++) { - pScreenInfo->formats[i] = g_PixmapFormats[i]; + screenInfo.formats[i] = g_PixmapFormats[i]; } /* Load pointers to DirectDraw functions */