diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-09 16:20:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-09 16:20:31 +1000 |
| commit | e6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d (patch) | |
| tree | a7f826331d620442aed6dc4eb07514ecc82553d1 /src/nv_proto.h | |
| parent | 3f4aa20f4f4dd3c1a306e87aafe030bb3c926688 (diff) | |
| parent | e182cff4f72f2e8403d94898c55cbca6e6349ba0 (diff) | |
| download | xorg-driver-xf86-video-nouveau-e6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d.tar.gz | |
Merge branch 'nv50-branch' into upstream-nv50-branch
Conflicts:
src/Makefile.am
src/nv_hw.c
src/nv_proto.h
Diffstat (limited to 'src/nv_proto.h')
| -rw-r--r-- | src/nv_proto.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/nv_proto.h b/src/nv_proto.h index d1075b2..6e50bd5 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h @@ -132,5 +132,18 @@ Bool NV30EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr, void NV30EXAComposite(PixmapPtr, int, int, int, int, int, int, int, int); void NV30EXADoneComposite(PixmapPtr); +/* in nv50_exa.c */ +Bool NV50EXAPrepareSolid(PixmapPtr, int, Pixel, Pixel); +void NV50EXASolid(PixmapPtr, int, int, int, int); +void NV50EXADoneSolid(PixmapPtr); +Bool NV50EXAPrepareCopy(PixmapPtr, PixmapPtr, int, int, int, Pixel); +void NV50EXACopy(PixmapPtr, int, int, int, int, int, int); +void NV50EXADoneCopy(PixmapPtr); +Bool NV50EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr); +Bool NV50EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr, + PixmapPtr, PixmapPtr, PixmapPtr); +void NV50EXAComposite(PixmapPtr, int, int, int, int, int, int, int, int); +void NV50EXADoneComposite(PixmapPtr); + #endif /* __NV_PROTO_H__ */ |