qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-12-01 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Be paranoid about the DGA extension as well.

Browse source
This commit is contained in:
Jeff Teunissen 2001-02-11 23:07:39 +00:00
parent a12c6913dc
commit 7cb5126153
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/dga_check.c
View file

@ -34,9 +34,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xproto.h>
#ifdef HAVE_DGA #ifdef HAVE_DGA
# include <X11/extensions/xf86dga.h> # include <X11/extensions/xf86dga.h>
# include <X11/extensions/xf86dgastr.h>
#endif #endif
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
# include <X11/extensions/xf86vmode.h> # include <X11/extensions/xf86vmode.h>
@ -59,7 +61,7 @@ VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo)
int event_base, error_base, dgafeat; int event_base, error_base, dgafeat;
int dummy, dummy_major, dummy_minor, dummy_video; int dummy, dummy_major, dummy_minor, dummy_video;
if (!XQueryExtension (dpy, "XFree86-DGA", &dummy, &dummy, &dummy)) { if (!XQueryExtension (dpy, XF86DGANAME, &dummy, &dummy, &dummy)) {
return false; return false;
} }
@ -76,6 +78,12 @@ VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo)
return false; return false;
} }
if ((!maj_ver) || (*maj_ver != XDGA_MAJOR_VERSION)) {
Con_Printf ("VID: Incorrect DGA version: %d.%d, \n", *maj_ver, *min_ver);
return false;
}
Con_Printf ("VID: DGA version: %d.%d\n", *maj_ver, *min_ver);
if (!hasvideo) if (!hasvideo)
hasvideo = &dummy_video; hasvideo = &dummy_video;
@ -125,11 +133,11 @@ VID_CheckVMode (Display * dpy, int *maj_ver, int *min_ver)
return false; return false;
if ((!maj_ver) || (*maj_ver != XF86VIDMODE_MAJOR_VERSION)) { if ((!maj_ver) || (*maj_ver != XF86VIDMODE_MAJOR_VERSION)) {
Con_Printf ("VID: Incorrect VidMode version: %d.%d, \n", *maj_ver, *min_ver); Con_Printf ("VID: Incorrect VidMode version: %d.%d\n", *maj_ver, *min_ver);
return false; return false;
} }
Con_Printf ("VID: VidMode version: %d.%d, \n", *maj_ver, *min_ver); Con_Printf ("VID: VidMode version: %d.%d\n", *maj_ver, *min_ver);
return true; return true;
#else #else
return false; return false;