qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 14:42:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed personally offensive copyright notice (mine -- I'll let anyone

Browse source 
else take all the credit they want, keep me out of it); edited so that the
DGA/Vmode detection functions return 0 if HAS_DGA is not defined.
This commit is contained in:
Jeff Teunissen 2000-01-11 04:18:13 +00:00
parent d7ec75b4d9
commit 9af36c78ff
2 changed files with 46 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/dga_check.c
View file

@ -1,7 +1,9 @@
/* /*
dga_check.c
Routines to check for XFree86 DGA and VidMode extensions Routines to check for XFree86 DGA and VidMode extensions
Copyright (C) 2000 Jeff Teunissen [d2deek@pmail.net] Copyright (C) 2000 Contributors of the QuakeForge Project
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]
Please see the file "AUTHORS" for a list of contributors Please see the file "AUTHORS" for a list of contributors
@ -33,6 +35,7 @@
#ifdef HAS_DGA #ifdef HAS_DGA
#include <X11/extensions/xf86dga.h> #include <X11/extensions/xf86dga.h>
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#endif
/* /*
VID_CheckDGA VID_CheckDGA
@ -42,6 +45,7 @@
int int
VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver) VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver)
{ {
#ifdef HAS_DGA
int event_base, error_base; int event_base, error_base;
if (! XF86DGAQueryExtension(dpy, &event_base, &error_base)) { if (! XF86DGAQueryExtension(dpy, &event_base, &error_base)) {
@ -49,6 +53,9 @@ VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver)
} }
return XF86DGAQueryVersion(dpy, maj_ver, min_ver); return XF86DGAQueryVersion(dpy, maj_ver, min_ver);
#else
return 0;
#endif // HAS_DGA
} }
@ -60,6 +67,7 @@ VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver)
int int
VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver) VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver)
{ {
#ifdef HAS_DGA
int event_base, error_base; int event_base, error_base;
if (! XF86VidModeQueryExtension(dpy, &event_base, &error_base)) { if (! XF86VidModeQueryExtension(dpy, &event_base, &error_base)) {
@ -67,6 +75,7 @@ VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver)
} }
return XF86VidModeQueryVersion(dpy, maj_ver, min_ver); return XF86VidModeQueryVersion(dpy, maj_ver, min_ver);
#else
return 0;
#endif // HAS_DGA
} }
#endif /* HAS_DGA */

2
common/dga_check.h
View file

@ -3,7 +3,7 @@
Definitions for XFree86 DGA and VidMode support Definitions for XFree86 DGA and VidMode support
Copyright (C) 2000 Jeff Teunissen [d2deek@pmail.net] Copyright (C) 2000 Contributors of the QuakeForge Project
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]
Please see the file "AUTHORS" for a list of contributors Please see the file "AUTHORS" for a list of contributors