diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/glx/glxdrawable.h | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/glx/glxdrawable.h')
| -rw-r--r-- | xorg-server/glx/glxdrawable.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xorg-server/glx/glxdrawable.h b/xorg-server/glx/glxdrawable.h index 2a365c505..007658961 100644 --- a/xorg-server/glx/glxdrawable.h +++ b/xorg-server/glx/glxdrawable.h @@ -44,34 +44,34 @@ enum { }; struct __GLXdrawable { - void (*destroy)(__GLXdrawable *private); - GLboolean (*swapBuffers)(ClientPtr client, __GLXdrawable *); - void (*copySubBuffer)(__GLXdrawable *drawable, - int x, int y, int w, int h); - void (*waitX)(__GLXdrawable *); - void (*waitGL)(__GLXdrawable *); + void (*destroy) (__GLXdrawable * private); + GLboolean(*swapBuffers) (ClientPtr client, __GLXdrawable *); + void (*copySubBuffer) (__GLXdrawable * drawable, + int x, int y, int w, int h); + void (*waitX) (__GLXdrawable *); + void (*waitGL) (__GLXdrawable *); DrawablePtr pDraw; XID drawId; /* - ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or - ** GLX_DRAWABLE_PBUFFER. - */ + ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or + ** GLX_DRAWABLE_PBUFFER. + */ int type; /* - ** Configuration of the visual to which this drawable was created. - */ + ** Configuration of the visual to which this drawable was created. + */ __GLXconfig *config; GLenum target; GLenum format; /* - ** Event mask - */ + ** Event mask + */ unsigned long eventMask; }; -#endif /* !__GLX_drawable_h__ */ +#endif /* !__GLX_drawable_h__ */ |