diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-16 15:49:30 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-16 15:49:30 +0100 |
| commit | 5ce9342f5abfc34e0f1e13e0be8d2c3d4888422f (patch) | |
| tree | de7fe114de83c0976a255d12fc427559b1ffdb61 /src/nouveau_exa.c | |
| parent | 1c8eb7da72f1d272aa5eb6f549d9a5eef6e40df4 (diff) | |
| download | xorg-driver-xf86-video-nouveau-screen-conv-api.tar.gz | |
nouveau: convert to new screen conversion APIsscreen-conv-api
The compat header takes care of the old server vs new server.
this commit was autogenerated from util/modular/x-driver-screen-scrn-conv.sh
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/nouveau_exa.c')
| -rw-r--r-- | src/nouveau_exa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 9aaa3f2..7b3b086 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -83,7 +83,7 @@ static Bool nouveau_exa_prepare_access(PixmapPtr ppix, int index) { struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); - NVPtr pNv = NVPTR(xf86Screens[ppix->drawable.pScreen->myNum]); + NVPtr pNv = NVPTR(xf86ScreenToScrn(ppix->drawable.pScreen)); if (nv50_style_tiled_pixmap(ppix) && !pNv->wfb_enabled) return FALSE; @@ -108,7 +108,7 @@ static void * nouveau_exa_create_pixmap(ScreenPtr pScreen, int width, int height, int depth, int usage_hint, int bitsPerPixel, int *new_pitch) { - ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); NVPtr pNv = NVPTR(scrn); struct nouveau_pixmap *nvpix; int ret; @@ -148,7 +148,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) bool nv50_style_tiled_pixmap(PixmapPtr ppix) { - ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(ppix->drawable.pScreen); NVPtr pNv = NVPTR(pScrn); return pNv->Architecture >= NV_ARCH_50 && @@ -159,7 +159,7 @@ static Bool nouveau_exa_download_from_screen(PixmapPtr pspix, int x, int y, int w, int h, char *dst, int dst_pitch) { - ScrnInfoPtr pScrn = xf86Screens[pspix->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pspix->drawable.pScreen); NVPtr pNv = NVPTR(pScrn); struct nouveau_bo *bo; int src_pitch, tmp_pitch, cpp, offset; @@ -219,7 +219,7 @@ static Bool nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int y, int w, int h, char *src, int src_pitch) { - ScrnInfoPtr pScrn = xf86Screens[pdpix->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pdpix->drawable.pScreen); NVPtr pNv = NVPTR(pScrn); int dst_pitch, tmp_pitch, cpp; int max_lines, lines, i; @@ -306,7 +306,7 @@ memcpy: Bool nouveau_exa_pixmap_is_onscreen(PixmapPtr ppix) { - ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(ppix->drawable.pScreen); if (pScrn->pScreen->GetScreenPixmap(pScrn->pScreen) == ppix) return TRUE; @@ -317,7 +317,7 @@ nouveau_exa_pixmap_is_onscreen(PixmapPtr ppix) Bool nouveau_exa_init(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); NVPtr pNv = NVPTR(pScrn); ExaDriverPtr exa; |