Madeorsk/xorg-xf86-video-remoteorsk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use XFreeXDGA to determine DGA support

Browse Source 
If our server supports DGA and we want to build the dummy driver without it,
XFreeXDGA will be defined by the server and will be picked up rather than
our configuration option.  This change forces us to honor our configuration
hoice.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2012-01-09 01:00:40 -08:00
parent bccf37f052
commit 02918fd534
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
if test "x$DGA" = xyes; then if test "x$DGA" = xyes; then
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
AC_DEFINE(XFreeXDGA, 1, [Support DGA extension]) AC_DEFINE(USE_DGA, 1, [Support DGA extension])
fi fi
AC_SUBST([DGA]) AC_SUBST([DGA])
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])

4
src/dummy_driver.c
View File

@ -45,7 +45,7 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include "servermd.h" #include "servermd.h"
#ifdef XFreeXDGA #ifdef USE_DGA
#define _XF86DGA_SERVER_ #define _XF86DGA_SERVER_
#include <X11/extensions/xf86dgaproto.h> #include <X11/extensions/xf86dgaproto.h>
#endif #endif
@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetBlackWhitePixels(pScreen); xf86SetBlackWhitePixels(pScreen);
#ifdef XFreeXDGA #ifdef USE_DGA
DUMMYDGAInit(pScreen); DUMMYDGAInit(pScreen);
#endif #endif