made DGA code _EXPERIMENTAL_

common/dga_check.c

@@ -47,7 +47,7 @@
 int
 VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver, int *hasvideo)
 {
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	int event_base, error_base, dgafeat, dummy;
 
 	if (! XF86DGAQueryExtension(dpy, &event_base, &error_base)) {
@@ -81,7 +81,7 @@ VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver, int *hasvideo)
 int
 VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver)
 {
-#ifdef HAS_DGA
+#if (defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	XF86VidModeModeInfo **vidmodes;
 	int event_base, error_base;
 	int dummy;

common/gl_vidglx.c

@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
 
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 #include <X11/extensions/xf86dga.h>
 #include <X11/extensions/xf86vmode.h>
 #endif
@@ -74,7 +74,7 @@ static float	old_mouse_x, old_mouse_y;
 static int	mouse_grabbed = 0;
 #define	mouse_shouldgrab ((int)vid_glx_fullscreen.value ||(int)_windowed_mouse.value)
 
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 static int	nummodes;
 static XF86VidModeModeInfo **vidmodes;
 static int	hasdga = 0, hasdgavideo = 0, hasvidmode = 0;
@@ -88,7 +88,7 @@ static int	xmesafullscreen = 0;
 
 static int scr_width, scr_height;
 
-#if defined(XMESA) || defined(HAS_DGA)
+#if defined(XMESA) || (defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 int VID_options_items = 2;
 #else
 int VID_options_items = 1;
@@ -171,7 +171,7 @@ do_grabs(int grab)
 		XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync,
 			      CurrentTime);
 
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 		if (hasdga) {
 			XF86DGADirectVideo(dpy, screen, XF86DGADirectMouse);
 			dgamouse = 1;
@@ -186,7 +186,7 @@ do_grabs(int grab)
 		/*
 		  Release grab
 		*/
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 		if (dgamouse) {
 			XF86DGADirectVideo(dpy, screen, 0);
 			dgamouse = 0;
@@ -218,7 +218,7 @@ do_fullscreen(int full)
 		return;
 	}
 #endif
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	if (hasvidmode) {
 		static int prev_x = 0, prev_y = 0, prev_w = 640, prev_h = 480;
 
@@ -280,7 +280,7 @@ VID_Shutdown(void)
 
 	glXDestroyContext(dpy, ctx);
 	ctx = NULL;
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	if (hasvidmode) {
 		int i;
 
@@ -532,7 +532,7 @@ void VID_Init(unsigned char *palette)
 	Cvar_RegisterVariable(&gl_ztrick);
 	Cvar_RegisterVariable(&_windowed_mouse);
         Cvar_RegisterVariable(&vid_glx_fullscreen);
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	Cvar_RegisterVariable(&vid_dga_mouseaccel);
 #endif
 
@@ -581,7 +581,7 @@ void VID_Init(unsigned char *palette)
 		exit(1);
 	}
 
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	{
 		int maj_ver;
 
@@ -815,7 +815,7 @@ GetEvent(void)
 		break;
 
 	case MotionNotify:
-#ifdef HAS_DGA
+#if defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 		if (dgamouse) {
 			mouse_x += (float)x_event.xmotion.x_root
 				* vid_dga_mouseaccel.value;
@@ -972,7 +972,7 @@ void VID_ExtraOptionDraw(unsigned int options_draw_cursor)
         M_DrawCheckbox(220, options_draw_cursor, _windowed_mouse.value);
 
 
-#if defined(XMESA) || defined(HAS_DGA)
+#if defined(XMESA) || (defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	/* Mesa has a fullscreen / windowed glx hack. */
         M_Print(16, options_draw_cursor+=8, "            Fullscreen");
         M_DrawCheckbox(220, options_draw_cursor, vid_glx_fullscreen.value);
@@ -987,7 +987,7 @@ void VID_ExtraOptionCmd(int option_cursor)
 		Cvar_SetValue("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
-#if defined(XMESA) || defined(HAS_DGA)
+#if defined(XMESA) || (defined(HAS_DGA) && defined(_EXPERIMENTAL_))
 	case 2:
 		Cvar_SetValue ("vid_glx_fullscreen",!vid_glx_fullscreen.value);
 		break;