diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /hw/xfree86/dri/dri.h | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
Diffstat (limited to 'hw/xfree86/dri/dri.h')
| -rw-r--r-- | hw/xfree86/dri/dri.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index c81500dc4..516da97a5 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -109,7 +109,7 @@ typedef struct { */ #define DRIINFO_MAJOR_VERSION 5 -#define DRIINFO_MINOR_VERSION 3 +#define DRIINFO_MINOR_VERSION 4 #define DRIINFO_PATCH_VERSION 0 typedef unsigned long long (*DRITexOffsetStartProcPtr)(PixmapPtr pPix); @@ -189,6 +189,12 @@ typedef struct { /* New with DRI version 5.3.0 */ DRITexOffsetStartProcPtr texOffsetStart; DRITexOffsetFinishProcPtr texOffsetFinish; + + /* New with DRI version 5.4.0 */ + int dontMapFrameBuffer; + drm_handle_t hFrameBuffer; /* Handle to framebuffer, either + * mapped by DDX driver or DRI */ + } DRIInfoRec, *DRIInfoPtr; @@ -233,12 +239,12 @@ extern Bool DRIDestroyContext(ScreenPtr pScreen, XID context); extern Bool DRIContextPrivDelete(pointer pResource, XID id); extern Bool DRICreateDrawable(ScreenPtr pScreen, - Drawable id, + ClientPtr client, DrawablePtr pDrawable, drm_drawable_t * hHWDrawable); extern Bool DRIDestroyDrawable(ScreenPtr pScreen, - Drawable id, + ClientPtr client, DrawablePtr pDrawable); extern Bool DRIDrawablePrivDelete(pointer pResource, @@ -301,6 +307,8 @@ extern void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg); +extern Bool DRIDestroyWindow(WindowPtr pWin); + extern void DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); |