summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/smi_driver.c2
-rw-r--r--src/smi_exa.c20
-rw-r--r--src/smi_video.c10
-rw-r--r--src/smi_xaa.c2
4 files changed, 17 insertions, 17 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 604b675..4794571 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1887,7 +1887,7 @@ SMI_FreeScreen(FREE_SCREEN_ARGS_DECL)
static Bool
SMI_SaveScreen(ScreenPtr pScreen, int mode)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ENTER();
diff --git a/src/smi_exa.c b/src/smi_exa.c
index 5103924..70298ed 100644
--- a/src/smi_exa.c
+++ b/src/smi_exa.c
@@ -91,7 +91,7 @@ SMI_DoneComposite(PixmapPtr pDst);
Bool
SMI_EXAInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -187,7 +187,7 @@ SMI_EXAInit(ScreenPtr pScreen)
static void
SMI_EXASync(ScreenPtr pScreen, int marker)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ENTER();
@@ -222,7 +222,7 @@ static Bool
SMI_PrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir, int ydir,
int alu, Pixel planemask)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int src_pitch, dst_pitch;
unsigned long src_offset, dst_offset;
@@ -289,7 +289,7 @@ static void
SMI_Copy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX,
int dstY, int width, int height)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();
@@ -367,7 +367,7 @@ CARD8 SMI_SolidRop[16] = /* table stolen from KAA */
static Bool
SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int dst_pitch;
unsigned long dst_offset;
@@ -437,7 +437,7 @@ SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
static void
SMI_Solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int w, h;
@@ -509,7 +509,7 @@ Bool
SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
char *src, int src_pitch)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int dst_pixelpitch, src_pixelpitch, align, aligned_pitch;
unsigned long dst_offset;
@@ -621,7 +621,7 @@ static Bool
SMI_PrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, PicturePtr pDstPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int src_pitch = exaGetPixmapPitch(pSrc) / (pSrc->drawable.bitsPerPixel >> 3);
int dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >> 3);
@@ -671,7 +671,7 @@ static void
SMI_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
PictTransformPtr t = pSmi->renderTransform;
PictVector v;
@@ -711,7 +711,7 @@ static void
SMI730_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
int maxPixels;
diff --git a/src/smi_video.c b/src/smi_video.c
index 9d8b35f..7900b3e 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -611,7 +611,7 @@ SMI_BuildEncodings(SMI_PortPtr p)
void
SMI_InitVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr *ptrAdaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr newAdaptor = NULL;
int numAdaptors;
@@ -814,7 +814,7 @@ SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value)
static XF86VideoAdaptorPtr
SMI_SetupVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr smiPortPtr;
XF86VideoAdaptorPtr ptrAdaptor;
@@ -2150,7 +2150,7 @@ SMI_InitOffscreenImages(
)
{
XF86OffscreenImagePtr offscreenImages;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr pPort = (SMI_PortPtr) pSmi->ptrAdaptor->pPortPrivates[0].ptr;
@@ -2188,7 +2188,7 @@ SMI_InitOffscreenImages(
static void
SMI_VideoSave(ScreenPtr pScreen, ExaOffscreenArea *area)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
SMI_PortPtr pPort = pSmi->ptrAdaptor->pPortPrivates[0].ptr;
@@ -2203,7 +2203,7 @@ SMI_VideoSave(ScreenPtr pScreen, ExaOffscreenArea *area)
CARD32
SMI_AllocateMemory(ScrnInfoPtr pScrn, void **mem_struct, int size)
{
- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
SMIPtr pSmi = SMIPTR(pScrn);
int offset = 0;
diff --git a/src/smi_xaa.c b/src/smi_xaa.c
index 95b5c95..a878098 100644
--- a/src/smi_xaa.c
+++ b/src/smi_xaa.c
@@ -70,7 +70,7 @@ SMI_XAAInit(ScreenPtr pScreen)
{
#ifdef HAVE_XAA_H
XAAInfoRecPtr infoPtr;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
/*BoxRec AvailFBArea;*/
Bool ret;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 05:19:18 +0000