From cf02484fb668ca20afb8e426b44dc01397d83f87 Mon Sep 17 00:00:00 2001 From: Vinson Lee <vlee@vmware.com> Date: Tue, 22 Dec 2009 14:51:12 -0800 Subject: glx: Compile dri2.c only if GLX_DIRECT_RENDERING is defined. --- src/glx/x11/dri2.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/glx/x11') diff --git a/src/glx/x11/dri2.c b/src/glx/x11/dri2.c index e144ed3e1f9..dad04470a00 100644 --- a/src/glx/x11/dri2.c +++ b/src/glx/x11/dri2.c @@ -31,6 +31,8 @@ */ +#ifdef GLX_DIRECT_RENDERING + #define NEED_REPLIES #include <X11/Xlibint.h> #include <X11/extensions/Xext.h> @@ -377,3 +379,5 @@ DRI2CopyRegion(Display * dpy, XID drawable, XserverRegion region, UnlockDisplay(dpy); SyncHandle(); } + +#endif /* GLX_DIRECT_RENDERING */ -- cgit v1.2.3 From cf3bb0cf315a761210a0b3bf426aa6f30024fac3 Mon Sep 17 00:00:00 2001 From: Vinson Lee <vlee@vmware.com> Date: Wed, 23 Dec 2009 12:42:38 -0800 Subject: glx: Move declaration outside for loop. --- src/glx/x11/glxext.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/glx/x11') diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index e5553cbf76c..5633a3e4a29 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -150,8 +150,9 @@ FreeScreenConfigs(__GLXdisplayPrivate * priv) #ifdef GLX_DIRECT_RENDERING if (psc->driver_configs) { - for (unsigned int i = 0; psc->driver_configs[i]; i++) - free((__DRIconfig *) psc->driver_configs[i]); + unsigned int j; + for (j = 0; psc->driver_configs[j]; j++) + free((__DRIconfig *) psc->driver_configs[j]); free(psc->driver_configs); psc->driver_configs = NULL; } -- cgit v1.2.3 From 6c8c1ce78b59f76c4a4e0c354f74e6dfb5615e8a Mon Sep 17 00:00:00 2001 From: Vinson Lee <vlee@vmware.com> Date: Wed, 23 Dec 2009 14:09:36 -0800 Subject: glx: Add XF86DRI[Open|Close]FullScreen prototypes to xf86dri.h. --- src/glx/x11/xf86dri.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/glx/x11') diff --git a/src/glx/x11/xf86dri.h b/src/glx/x11/xf86dri.h index f2d0dd54355..ba266003f70 100644 --- a/src/glx/x11/xf86dri.h +++ b/src/glx/x11/xf86dri.h @@ -115,6 +115,10 @@ Bool XF86DRIGetDeviceInfo(Display * dpy, int screen, int *fbSize, int *fbStride, int *devPrivateSize, void **pDevPrivate); +Bool XF86DRIOpenFullScreen(Display * dpy, int screen, Drawable drawable); + +Bool XF86DRICloseFullScreen(Display * dpy, int screen, Drawable drawable); + _XFUNCPROTOEND #endif /* _XF86DRI_SERVER_ */ #endif /* _XF86DRI_H_ */ -- cgit v1.2.3