XLibre/xf86-video-qxl
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-qxl.git synced 2026-03-24 01:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop obsolete compat macros

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-02 13:29:35 +01:00
committed by Enrico Weigelt
parent 6b07c9e4bc
commit 8f2650c739
7 changed files with 24 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@@ -68,8 +68,7 @@ qxl_drv_la_SOURCES = \
dfps.c \
qxl_kms.c \
qxl_drmmode.c \
qxl_drmmode.h \
compat-api.h
qxl_drmmode.h
endif
if BUILD_XSPICE
@@ -123,6 +122,5 @@ spiceqxl_drv_la_SOURCES = \
dfps.h \
qxl_uxa.c \
qxl_ums_mode.c \
qxl_io.c \
compat-api.h
qxl_io.c
endif

27
src/compat-api.h
View File

@@ -28,31 +28,4 @@
#ifndef COMPAT_API_H
#define COMPAT_API_H
#define SCRN_ARG_TYPE ScrnInfoPtr
#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
#define SCREEN_ARG_TYPE ScreenPtr
#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
#define SWITCH_MODE_ARGS(arg, m) arg, m
#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
#define VT_FUNC_ARGS pScrn
#define XF86_SCRN_ARG(x) (x)
#endif

7
src/qxl.h
View File

@@ -58,7 +58,6 @@ typedef struct xorg_list xorg_list_t;
struct xf86_platform_device;
#include "compat-api.h"
#define hidden _X_HIDDEN
#ifdef XSPICE
@@ -584,9 +583,9 @@ void qxl_io_flush_release (qxl_screen_t *qxl);
Bool qxl_pre_init_common(ScrnInfoPtr pScrn);
Bool qxl_fb_init (qxl_screen_t *qxl, ScreenPtr pScreen);
Bool qxl_screen_init_kms(SCREEN_INIT_ARGS_DECL);
Bool qxl_enter_vt_kms (VT_FUNC_ARGS_DECL);
void qxl_leave_vt_kms (VT_FUNC_ARGS_DECL);
Bool qxl_screen_init_kms(ScreenPtr pScreen, int argc, char **argv);
Bool qxl_enter_vt_kms (ScrnInfoPtr arg);
void qxl_leave_vt_kms (ScrnInfoPtr arg);
void qxl_set_screen_pixmap_header (ScreenPtr pScreen);
Bool qxl_resize_primary_to_virtual (qxl_screen_t *qxl);
void qxl_get_formats (int bpp, SpiceSurfaceFmt *format, pixman_format_code_t *pformat);

19
src/qxl_driver.c
View File

@@ -423,7 +423,7 @@ qxl_restore_state (ScrnInfoPtr pScrn)
#endif /* XSPICE */
static Bool
qxl_close_screen (CLOSE_SCREEN_ARGS_DECL)
qxl_close_screen (ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn (pScreen);
qxl_screen_t *qxl = pScrn->driverPrivate;
@@ -435,7 +435,7 @@ qxl_close_screen (CLOSE_SCREEN_ARGS_DECL)
pScreen->CreateScreenResources = qxl->create_screen_resources;
pScreen->CloseScreen = qxl->close_screen;
result = pScreen->CloseScreen (CLOSE_SCREEN_ARGS);
result = pScreen->CloseScreen (pScreen);
#ifndef XSPICE
if (!xf86IsPrimaryPci (qxl->pci) && qxl->primary)
@@ -568,9 +568,8 @@ qxl_resize_primary (qxl_screen_t *qxl, uint32_t width, uint32_t height)
}
static Bool
qxl_switch_mode (SWITCH_MODE_ARGS_DECL)
qxl_switch_mode (ScrnInfoPtr pScrn, DisplayModePtr mode)
{
SCRN_INFO_PTR (arg);
qxl_screen_t *qxl = pScrn->driverPrivate;
ErrorF ("Ignoring display mode, ensuring recreation of primary\n");
@@ -668,7 +667,7 @@ qxl_fb_init (qxl_screen_t *qxl, ScreenPtr pScreen)
}
static Bool
qxl_screen_init (SCREEN_INIT_ARGS_DECL)
qxl_screen_init (ScreenPtr pScreen, int argc, char **argv)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn (pScreen);
qxl_screen_t * qxl = pScrn->driverPrivate;
@@ -800,9 +799,8 @@ out:
}
static Bool
qxl_enter_vt (VT_FUNC_ARGS_DECL)
qxl_enter_vt (ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR (arg);
qxl_screen_t *qxl = pScrn->driverPrivate;
qxl_save_state (pScrn);
@@ -829,20 +827,19 @@ qxl_enter_vt (VT_FUNC_ARGS_DECL)
qxl_create_desired_modes (qxl);
pScrn->EnableDisableFBAccess (XF86_SCRN_ARG (pScrn), TRUE);
pScrn->EnableDisableFBAccess (pScrn, TRUE);
return TRUE;
}
static void
qxl_leave_vt (VT_FUNC_ARGS_DECL)
qxl_leave_vt (ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR (arg);
qxl_screen_t *qxl = pScrn->driverPrivate;
xf86_hide_cursors (pScrn);
pScrn->EnableDisableFBAccess (XF86_SCRN_ARG (pScrn), FALSE);
pScrn->EnableDisableFBAccess (pScrn, FALSE);
if (qxl->deferred_fps <= 0)
qxl->vt_surfaces = qxl_surface_cache_evacuate_all (qxl->surface_cache);

16
src/qxl_kms.c
View File

@@ -116,7 +116,7 @@ static Bool qxl_open_drm_master(ScrnInfoPtr pScrn)
}
static Bool
qxl_close_screen_kms (CLOSE_SCREEN_ARGS_DECL)
qxl_close_screen_kms (ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn (pScreen);
qxl_screen_t *qxl = pScrn->driverPrivate;
@@ -125,7 +125,7 @@ qxl_close_screen_kms (CLOSE_SCREEN_ARGS_DECL)
qxl_drmmode_uevent_fini(pScrn, &qxl->drmmode);
pScreen->CloseScreen = qxl->close_screen;
result = pScreen->CloseScreen (CLOSE_SCREEN_ARGS);
result = pScreen->CloseScreen (pScreen);
return result;
}
@@ -238,9 +238,8 @@ qxl_blank_screen (ScreenPtr pScreen, int mode)
}
Bool
qxl_enter_vt_kms (VT_FUNC_ARGS_DECL)
qxl_enter_vt_kms (ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR (arg);
qxl_screen_t *qxl = pScrn->driverPrivate;
int ret;
@@ -260,18 +259,15 @@ qxl_enter_vt_kms (VT_FUNC_ARGS_DECL)
if (!xf86SetDesiredModes(pScrn))
return FALSE;
// pScrn->EnableDisableFBAccess (XF86_SCRN_ARG (pScrn), TRUE);
return TRUE;
}
void
qxl_leave_vt_kms (VT_FUNC_ARGS_DECL)
qxl_leave_vt_kms (ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR (arg);
int ret;
qxl_screen_t *qxl = pScrn->driverPrivate;
xf86_hide_cursors (pScrn);
// pScrn->EnableDisableFBAccess (XF86_SCRN_ARG (pScrn), FALSE);
#ifdef XF86_PDEV_SERVER_FD
if (qxl->platform_dev && (qxl->platform_dev->flags & XF86_PDEV_SERVER_FD))
@@ -287,7 +283,7 @@ qxl_leave_vt_kms (VT_FUNC_ARGS_DECL)
}
Bool qxl_screen_init_kms(SCREEN_INIT_ARGS_DECL)
Bool qxl_screen_init_kms(ScreenPtr pScreen, int argc, char **argv)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn (pScreen);
qxl_screen_t * qxl = pScrn->driverPrivate;
@@ -357,7 +353,7 @@ Bool qxl_screen_init_kms(SCREEN_INIT_ARGS_DECL)
qxl->close_screen = pScreen->CloseScreen;
pScreen->CloseScreen = qxl_close_screen_kms;
return qxl_enter_vt_kms(VT_FUNC_ARGS);
return qxl_enter_vt_kms(pScrn);
out:
return FALSE;

3
src/uxa/uxa-priv.h
View File

@@ -54,7 +54,6 @@
#endif
#include "damage.h"
#include "../compat-api.h"
/* Provide substitutes for gcc's __FUNCTION__ on other compilers */
#if !defined(__GNUC__) && !defined(__FUNCTION__)
# if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */
@@ -105,7 +104,7 @@ typedef struct {
#define UXA_NUM_SOLID_CACHE 16
typedef void (*EnableDisableFBAccessProcPtr) (SCRN_ARG_TYPE, Bool);
typedef void (*EnableDisableFBAccessProcPtr) (ScrnInfoPtr, Bool);
typedef struct {
uxa_driver_t *info;
CreateGCProcPtr SavedCreateGC;

9
src/uxa/uxa.c
View File

@@ -349,9 +349,8 @@ static RegionPtr uxa_bitmap_to_region(PixmapPtr pPix)
return ret;
}
static void uxa_xorg_enable_disable_fb_access(SCRN_ARG_TYPE arg, Bool enable)
static void uxa_xorg_enable_disable_fb_access(ScrnInfoPtr pScrn, Bool enable)
{
SCRN_INFO_PTR(arg);
ScreenPtr pScreen = pScrn->pScreen;
uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
@@ -362,7 +361,7 @@ static void uxa_xorg_enable_disable_fb_access(SCRN_ARG_TYPE arg, Bool enable)
uxa_screen->swappedOut = FALSE;
if (uxa_screen->SavedEnableDisableFBAccess)
uxa_screen->SavedEnableDisableFBAccess(arg, enable);
uxa_screen->SavedEnableDisableFBAccess(pScrn, enable);
}
void uxa_set_fallback_debug(ScreenPtr screen, Bool enable)
@@ -390,7 +389,7 @@ Bool uxa_swapped_out(ScreenPtr screen)
* uxa_close_screen() unwraps its wrapped screen functions and tears down UXA's
* screen private, before calling down to the next CloseSccreen.
*/
static Bool uxa_close_screen(CLOSE_SCREEN_ARGS_DECL)
static Bool uxa_close_screen(ScreenPtr pScreen)
{
uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
@@ -435,7 +434,7 @@ static Bool uxa_close_screen(CLOSE_SCREEN_ARGS_DECL)
free(uxa_screen);
return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
return (*pScreen->CloseScreen) (pScreen);
}
/**