mirror of
https://github.com/X11Libre/xf86-video-geode.git
synced 2026-03-24 01:24:52 +00:00
drop compat with video api major version < 20
Since we're relying on xserver >= 1.18, we can assume video api major version >= 20. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
@@ -42,9 +42,6 @@
|
||||
/* Includes that are used by all drivers */
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
#endif
|
||||
#include "compiler.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
#endif
|
||||
#include "xf86cmap.h"
|
||||
#include "compiler.h"
|
||||
#include "mipointer.h"
|
||||
|
||||
@@ -61,16 +61,9 @@ typedef struct _GXRandRInfo {
|
||||
|
||||
static DevPrivateKeyRec GXRandRIndex;
|
||||
|
||||
#define OLD_VIDEODRV_INTERFACE (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
|
||||
|
||||
#if OLD_VIDEODRV_INTERFACE
|
||||
#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
|
||||
#define XF86RANDRSET(p, v) (p)->devPrivates[GXRandRIndex].ptr = v
|
||||
#else
|
||||
#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
|
||||
dixLookupPrivate(&(p)->devPrivates, &GXRandRIndex))
|
||||
#define XF86RANDRSET(p, v) dixSetPrivate(&(p)->devPrivates, &GXRandRIndex, v)
|
||||
#endif
|
||||
|
||||
static int
|
||||
GXRandRModeRefresh(DisplayModePtr mode)
|
||||
@@ -164,11 +157,7 @@ GXRandRSetMode(ScreenPtr pScreen,
|
||||
int oldmmWidth = pScreen->mmWidth;
|
||||
int oldmmHeight = pScreen->mmHeight;
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8
|
||||
WindowPtr pRoot = WindowTable[pScreen->myNum];
|
||||
#else
|
||||
WindowPtr pRoot = pScreen->root;
|
||||
#endif
|
||||
DisplayModePtr currentMode = NULL;
|
||||
Bool ret = TRUE;
|
||||
|
||||
@@ -343,9 +332,6 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
|
||||
if (GXRandRGeneration != serverGeneration) {
|
||||
GXRandRGeneration = serverGeneration;
|
||||
}
|
||||
#if OLD_VIDEODRV_INTERFACE
|
||||
GXRandRIndex = AllocateScreenPrivateIndex();
|
||||
#endif
|
||||
if (!dixRegisterPrivateKey(&GXRandRIndex, PRIVATE_SCREEN, 0))
|
||||
return FALSE;
|
||||
|
||||
|
||||
@@ -39,9 +39,6 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
#endif
|
||||
#include "xf86i2c.h"
|
||||
#include "xf86Crtc.h"
|
||||
#include "xf86cmap.h"
|
||||
|
||||
Reference in New Issue
Block a user