aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/xpr/dri.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-28 09:11:07 +0200
committermarha <marha@users.sourceforge.net>2012-03-28 09:11:07 +0200
commit9b51c6da8bffdd67353b1e1245698a7eac478481 (patch)
treecde44c263cb1756fae5b4a83facb3c0cdfa474e4 /xorg-server/hw/xquartz/xpr/dri.h
parentfb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (diff)
parentec617f09d07e32d6f57c0da133f53ad3d43a568a (diff)
downloadvcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.gz
vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.bz2
vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xquartz/xpr/dri.h')
-rw-r--r--xorg-server/hw/xquartz/xpr/dri.h127
1 files changed, 72 insertions, 55 deletions
diff --git a/xorg-server/hw/xquartz/xpr/dri.h b/xorg-server/hw/xquartz/xpr/dri.h
index b4342617c..8717a5186 100644
--- a/xorg-server/hw/xquartz/xpr/dri.h
+++ b/xorg-server/hw/xquartz/xpr/dri.h
@@ -1,35 +1,35 @@
/**************************************************************************
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2002, 2009 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright (c) 2002-2012 Apple Computer, Inc.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sub license, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial portions
+ of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
/*
* Authors:
* Jens Owen <jens@precisioninsight.com>
- *
+ * Jeremy Huddleston <jeremyhu@apple.com>
*/
/* Prototypes for AppleDRI functions */
@@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "appledri.h"
#include <Xplugin.h>
-typedef void (*ClipNotifyPtr) (WindowPtr, int, int);
+typedef void (*ClipNotifyPtr)(WindowPtr, int, int);
/*
* These functions can be wrapped by the DRI. Each of these have
@@ -63,19 +63,26 @@ typedef struct {
int kind;
} DRISurfaceNotifyArg;
-extern Bool DRIScreenInit(ScreenPtr pScreen);
+extern Bool
+DRIScreenInit(ScreenPtr pScreen);
-extern Bool DRIFinishScreenInit(ScreenPtr pScreen);
+extern Bool
+DRIFinishScreenInit(ScreenPtr pScreen);
-extern void DRICloseScreen(ScreenPtr pScreen);
+extern void
+DRICloseScreen(ScreenPtr pScreen);
-extern Bool DRIExtensionInit(void);
+extern Bool
+DRIExtensionInit(void);
-extern void DRIReset(void);
+extern void
+DRIReset(void);
-extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable);
+extern Bool
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable);
-extern Bool DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
+extern Bool
+DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
extern Bool DRICreateSurface(ScreenPtr pScreen,
Drawable id,
@@ -83,42 +90,52 @@ extern Bool DRICreateSurface(ScreenPtr pScreen,
xp_client_id client_id,
xp_surface_id * surface_id,
unsigned int key[2],
- void (*notify) (void *arg, void *data),
+ void (*notify)(void *arg, void *data),
void *notify_data);
-extern Bool DRIDestroySurface(ScreenPtr pScreen,
- Drawable id,
- DrawablePtr pDrawable,
- void (*notify) (void *arg, void *data),
- void *notify_data);
+extern Bool
+DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+ void (*notify)(void *arg,
+ void *data), void *notify_data);
-extern Bool DRIDrawablePrivDelete(pointer pResource, XID id);
+extern Bool
+DRIDrawablePrivDelete(pointer pResource, XID id);
-extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
+extern DRIWrappedFuncsRec *
+DRIGetWrappedFuncs(ScreenPtr pScreen);
-extern void DRICopyWindow(WindowPtr pWin,
- DDXPointRec ptOldOrg, RegionPtr prgnSrc);
+extern void
+DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
-extern int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
+extern int
+DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
-extern void DRIPostValidateTree(WindowPtr pParent,
- WindowPtr pChild, VTKind kind);
+extern void
+DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
-extern void DRIClipNotify(WindowPtr pWin, int dx, int dy);
+extern void
+DRIClipNotify(WindowPtr pWin, int dx, int dy);
-extern void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg);
+extern void
+DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg);
-extern void DRISurfaceNotify(xp_surface_id id, int kind);
+extern void
+DRISurfaceNotify(xp_surface_id id, int kind);
-extern void DRIQueryVersion(int *majorVersion,
- int *minorVersion, int *patchVersion);
+extern void
+DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion);
-extern Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,
- DrawablePtr pDrawable, char *path, size_t pathmax);
+extern Bool
+DRICreatePixmap(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+ char *path,
+ size_t pathmax);
-extern Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
- int *pitch, int *bpp, void **ptr);
+extern Bool
+DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height, int *pitch,
+ int *bpp,
+ void **ptr);
-extern void DRIDestroyPixmap(DrawablePtr pDrawable);
+extern void
+DRIDestroyPixmap(DrawablePtr pDrawable);
#endif