summaryrefslogtreecommitdiff
path: root/src/nv40_exa.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-05-16 15:49:30 +0100
committerDave Airlie <airlied@redhat.com>2012-05-16 15:49:30 +0100
commit5ce9342f5abfc34e0f1e13e0be8d2c3d4888422f (patch)
treede7fe114de83c0976a255d12fc427559b1ffdb61 /src/nv40_exa.c
parent1c8eb7da72f1d272aa5eb6f549d9a5eef6e40df4 (diff)
downloadxorg-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/nv40_exa.c')
-rw-r--r--src/nv40_exa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nv40_exa.c b/src/nv40_exa.c
index 2361552..ce0d78a 100644
--- a/src/nv40_exa.c
+++ b/src/nv40_exa.c
@@ -456,7 +456,7 @@ NV40EXAPrepareComposite(int op, PicturePtr psPict,
PixmapPtr pmPix,
PixmapPtr pdPix)
{
- ScrnInfoPtr pScrn = xf86Screens[pdPix->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pdPix->drawable.pScreen);
NVPtr pNv = NVPTR(pScrn);
nv_pict_op_t *blend = NV40_GetPictOpRec(op);
struct nouveau_pushbuf *push = pNv->pushbuf;
@@ -537,7 +537,7 @@ void
NV40EXAComposite(PixmapPtr pdPix,
int sx, int sy, int mx, int my, int dx, int dy, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pdPix->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pdPix->drawable.pScreen);
NVPtr pNv = NVPTR(pScrn);
struct nouveau_pushbuf *push = pNv->pushbuf;
@@ -564,7 +564,7 @@ NV40EXAComposite(PixmapPtr pdPix,
void
NV40EXADoneComposite(PixmapPtr pdPix)
{
- ScrnInfoPtr pScrn = xf86Screens[pdPix->drawable.pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pdPix->drawable.pScreen);
nouveau_pushbuf_bufctx(NVPTR(pScrn)->pushbuf, NULL);
}