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

drop compat with ancient xserver versions

Browse Source 
We're relying on at least 1.18 now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-05-14 16:29:17 +02:00
parent efd928d763
commit 317951951f
6 changed files with 44 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
saa/saa.c
View File

@@ -607,7 +607,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
* wrapped _after_ DamageSetup().
*/
static Bool
saa_early_close_screen(CLOSE_SCREEN_ARGS_DECL)
saa_early_close_screen(ScreenPtr pScreen)
{
struct saa_screen_priv *sscreen = saa_screen(pScreen);
@@ -624,7 +624,7 @@ saa_early_close_screen(CLOSE_SCREEN_ARGS_DECL)
saa_unwrap_early(sscreen, pScreen, CloseScreen);
saa_unwrap(sscreen, pScreen, DestroyPixmap);
return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
return (*pScreen->CloseScreen) (pScreen);
}
/**
@@ -632,7 +632,7 @@ saa_early_close_screen(CLOSE_SCREEN_ARGS_DECL)
* screen private, before calling down to the next CloseScreen.
*/
Bool
saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
saa_close_screen(ScreenPtr pScreen)
{
struct saa_screen_priv *sscreen = saa_screen(pScreen);
struct saa_driver *driver = sscreen->driver;
@@ -651,7 +651,7 @@ saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
free(sscreen);
return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
return (*pScreen->CloseScreen) (pScreen);
}
struct saa_driver *

2
saa/saa.h
View File

@@ -170,7 +170,7 @@ extern _X_EXPORT RegionPtr
saa_bitmap_to_region(PixmapPtr pPix);
extern _X_EXPORT Bool
saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
saa_close_screen(ScreenPtr pScreen);
extern _X_EXPORT Bool
saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);

34
src/compat-api.h
View File

@@ -28,36 +28,10 @@
#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
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
#define BLOCKHANDLER_ARGS arg, pTimeout
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
#define BLOCKHANDLER_ARGS pScreen, pTimeout
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#endif
#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)
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
#endif

28
src/vmware.c
View File

@@ -846,8 +846,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap)
pScrn->pScreen->rootDepth),
(pointer)(pVMWARE->FbBase + pScrn->fbOffset));
(*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE);
(*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE);
(*pScrn->EnableDisableFBAccess)(pScrn, FALSE);
(*pScrn->EnableDisableFBAccess)(pScrn, TRUE);
}
vgaHWProtect(pScrn, FALSE);
@@ -963,7 +963,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
}
static void
VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL)
VMWAREAdjustFrame(ScrnInfoPtr arg, int x, int y)
{
/* FIXME */
}
@@ -1021,7 +1021,7 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
}
static Bool
VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
VMWARECloseScreen(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
@@ -1051,7 +1051,7 @@ VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
pScrn->DriverFunc = NULL;
#endif
return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
return (*pScreen->CloseScreen)(pScreen);
}
static Bool
@@ -1230,7 +1230,7 @@ vmwareIsRegionEqual(const RegionPtr reg1,
}
static Bool
VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
VMWAREScreenInit(ScreenPtr pScreen, int argc, char **argv)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
vgaHWPtr hwp;
@@ -1313,7 +1313,7 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
VMWAREModeInit(pScrn, pScrn->currentMode, FALSE);
/* Set the viewport if supported */
VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
VMWAREAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
/*
* Setup the screen's visuals, and initialise the framebuffer
@@ -1513,9 +1513,8 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
}
static Bool
VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
VMWARESwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
SCRN_INFO_PTR(arg);
ScreenPtr pScreen = pScrn->pScreen;
pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM +
@@ -1527,9 +1526,8 @@ VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
}
static Bool
VMWAREEnterVT(VT_FUNC_ARGS_DECL)
VMWAREEnterVT(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
/*
@@ -1546,9 +1544,8 @@ VMWAREEnterVT(VT_FUNC_ARGS_DECL)
}
static void
VMWARELeaveVT(VT_FUNC_ARGS_DECL)
VMWARELeaveVT(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
/*
@@ -1561,9 +1558,8 @@ VMWARELeaveVT(VT_FUNC_ARGS_DECL)
}
static void
VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
VMWAREFreeScreen(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
/*
* If the vgahw module is used vgaHWFreeHWRec() would be called
* here.
@@ -1572,7 +1568,7 @@ VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
}
static ModeStatus
VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
VMWAREValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
{
return MODE_OK;
}

47
vmwgfx/vmwgfx_driver.c
View File

@@ -111,13 +111,13 @@ typedef uint8_t uint8;
*/
static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags);
static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL);
static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL);
static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL);
static Bool drv_enter_vt(VT_FUNC_ARGS_DECL);
static void drv_leave_vt(VT_FUNC_ARGS_DECL);
static void drv_free_screen(FREE_SCREEN_ARGS_DECL);
static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
static Bool drv_screen_init(ScreenPtr pScreen, int argc, char **argv);
static Bool drv_switch_mode(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void drv_adjust_frame(ScrnInfoPtr arg, int x, int y);
static Bool drv_enter_vt(ScrnInfoPtr pScrn);
static void drv_leave_vt(ScrnInfoPtr pScrn);
static void drv_free_screen(ScrnInfoPtr pScrn);
static ModeStatus drv_valid_mode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose,
int flags);
extern void xorg_tracker_set_functions(ScrnInfoPtr scrn);
@@ -142,7 +142,7 @@ vmwgfx_modify_flags(uint32_t *flags)
* Internal function definitions
*/
static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL);
static Bool drv_close_screen(ScreenPtr pScreen);
/*
* Internal functions
@@ -793,7 +793,6 @@ void xorg_flush(ScreenPtr pScreen)
static void drv_block_handler(BLOCKHANDLER_ARGS_DECL)
{
SCREEN_PTR(arg);
modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
vmwgfx_swap(ms, pScreen, BlockHandler);
@@ -819,10 +818,10 @@ drv_create_screen_resources(ScreenPtr pScreen)
if (!ret)
return ret;
drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
drv_adjust_frame(pScrn, pScrn->frameX0, pScrn->frameY0);
vmwgfx_uevent_init(pScrn, ms);
return drv_enter_vt(VT_FUNC_ARGS);
return drv_enter_vt(pScrn);
}
static Bool
@@ -988,7 +987,7 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
static Bool
drv_screen_init(SCREEN_INIT_ARGS_DECL)
drv_screen_init(ScreenPtr pScreen, int argc, char **argv)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn);
@@ -1241,9 +1240,8 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
}
static void
drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
drv_adjust_frame(ScrnInfoPtr pScrn, int x, int y)
{
SCRN_INFO_PTR(arg);
modesettingPtr ms = modesettingPTR(pScrn);
xf86CrtcConfigPtr config;
xf86OutputPtr output;
@@ -1265,9 +1263,8 @@ drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
}
static void
drv_free_screen(FREE_SCREEN_ARGS_DECL)
drv_free_screen(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
modesettingPtr ms = modesettingPTR(pScrn);
vmwgfx_hosted_destroy(ms->hdriver, ms->hosted);
@@ -1275,9 +1272,8 @@ drv_free_screen(FREE_SCREEN_ARGS_DECL)
}
static void
drv_leave_vt(VT_FUNC_ARGS_DECL)
drv_leave_vt(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
modesettingPtr ms = modesettingPTR(pScrn);
if (!vmwgfx_is_hosted(ms->hdriver)) {
@@ -1299,9 +1295,8 @@ drv_leave_vt(VT_FUNC_ARGS_DECL)
* This gets called when gaining control of the VT, and from ScreenInit().
*/
static Bool
drv_enter_vt(VT_FUNC_ARGS_DECL)
drv_enter_vt(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
modesettingPtr ms = modesettingPTR(pScrn);
if (!drv_set_master(pScrn))
@@ -1316,15 +1311,13 @@ drv_enter_vt(VT_FUNC_ARGS_DECL)
}
static Bool
drv_switch_mode(SWITCH_MODE_ARGS_DECL)
drv_switch_mode(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
SCRN_INFO_PTR(arg);
return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
}
static Bool
drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
drv_close_screen(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn);
@@ -1339,7 +1332,7 @@ drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
xorg_dri2_close(pScreen);
if (pScrn->vtSema)
pScrn->LeaveVT(VT_FUNC_ARGS);
pScrn->LeaveVT(pScrn);
vmwgfx_uevent_fini(pScrn, ms);
vmw_xv_close(pScreen);
@@ -1354,7 +1347,7 @@ drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
vmwgfx_unwrap(ms, pScreen, BlockHandler);
vmwgfx_unwrap(ms, pScreen, CreateScreenResources);
ret = (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
ret = (*pScreen->CloseScreen) (pScreen);
if (ms->xat)
xa_tracker_destroy(ms->xat);
@@ -1363,7 +1356,7 @@ drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
}
static ModeStatus
drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
drv_valid_mode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
{
return MODE_OK;
}

6
vmwgfx/vmwgfx_driver.h
View File

@@ -127,9 +127,9 @@ typedef struct _modesettingRec
ScreenBlockHandlerProcPtr saved_BlockHandler;
CreateScreenResourcesProcPtr saved_CreateScreenResources;
CloseScreenProcPtr saved_CloseScreen;
Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL);
void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL);
void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL);
Bool (*saved_EnterVT)(ScrnInfoPtr pScrn);
void (*saved_LeaveVT)(ScrnInfoPtr pScrn);
void (*saved_AdjustFrame)(ScrnInfoPtr arg, int x, int y);
Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);