diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/kdrive/ephyr/ephyrdri.c | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrdri.c')
-rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrdri.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdri.c b/xorg-server/hw/kdrive/ephyr/ephyrdri.c index 53a96ba11..932e46886 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdri.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdri.c @@ -29,13 +29,10 @@ #include <kdrive-config.h> #endif -#ifdef XEPHYR_DRI - #include <X11/Xutil.h> #include <X11/Xlibint.h> -/*#define _XF86DRI_SERVER_*/ #include <GL/glx.h> -#include <X11/dri/xf86dri.h> +#include "xf86dri.h" #include "hostx.h" #include "ephyrdri.h" #define _HAVE_XALLOC_DECLS @@ -146,7 +143,7 @@ ephyrDRIGetClientDriverName (int a_screen, Bool ephyrDRICreateContext (int a_screen, int a_visual_id, - unsigned long int *a_returned_ctxt_id, + XID *a_returned_ctxt_id, drm_context_t *a_hw_ctxt) { Display *dpy = hostx_get_display () ; @@ -287,5 +284,3 @@ ephyrDRIGetDeviceInfo (int a_screen, EPHYR_LOG ("leave:%d\n", is_ok) ; return is_ok ; } -#endif /*EPHYR_DRI*/ - |