summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/common/utils.c
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@gmail.com>2004-07-04 20:33:48 +0000
committerJon Smirl <jonsmirl@gmail.com>2004-07-04 20:33:48 +0000
commitaaebfc88c08c79cd70f1e0d1d262a25e9ded47d1 (patch)
tree9c1aa0013c88e370457ea47aea3e8baccec87c52 /src/mesa/drivers/dri/common/utils.c
parent2371033bbaf6e7477bfa893654a0467a084f335b (diff)
Patch removes _SOLO definition needed for mesa-solo. mesa-solo
uses the NEW_INTERFACE now so _SOLO isn't necessary anymore. Tested with the hardware that I own.
Diffstat (limited to 'src/mesa/drivers/dri/common/utils.c')
-rw-r--r--src/mesa/drivers/dri/common/utils.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 83d5a8ff32..99dc064826 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -32,7 +32,7 @@
#include "extensions.h"
#include "utils.h"
-#if !defined( DRI_NEW_INTERFACE_ONLY ) && !defined( _SOLO )
+#if !defined( DRI_NEW_INTERFACE_ONLY )
#include "xf86dri.h" /* For XF86DRIQueryVersion prototype. */
#endif
@@ -171,7 +171,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv,
"but got version %d.%d.%d";
int major, minor, patch;
-#ifndef _SOLO
/* Check the DRI version */
if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
if (major != dri_major || minor < dri_minor) {
@@ -187,9 +186,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv,
sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
return GL_FALSE;
}
-#else
- (void)major;(void)minor;(void)patch;
-#endif
/* Check that the DRM driver version is compatible */
if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) {