summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam Jackson <ajax@freedesktop.org>2005-01-08 03:54:38 +0000
committerAdam Jackson <ajax@freedesktop.org>2005-01-08 03:54:38 +0000
commit1074eae704f4f68a721cfb9810cd0fde3d3aed07 (patch)
tree81ba02b0c1d9935c07f4ca4388429cb00a860012 /src
parentccaa15a0812f3cdac5669cb315e5e7e9eaba9685 (diff)
Enable libGL to be built with DRI_NEW_INTERFACE_ONLY (but don't do it yet).
Diffstat (limited to 'src')
-rw-r--r--src/glx/x11/XF86dri.c2
-rw-r--r--src/glx/x11/glxcmds.c4
-rw-r--r--src/glx/x11/glxext.c10
3 files changed, 11 insertions, 5 deletions
diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index b94fd97d34..d0b7f72554 100644
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -39,10 +39,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NEED_REPLIES
#include <X11/Xlibint.h>
-#include "xf86dristr.h"
#include <X11/extensions/Xext.h>
#include "extutil.h"
#include "glheader.h"
+#include "xf86dristr.h"
static XExtensionInfo _xf86dri_info_data;
static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index ba3bf7572d..c76502c022 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -72,6 +72,7 @@ static void * DriverCreateContextWrapper( const __GLXscreenConfigs *psc,
Display *dpy, XVisualInfo *vis, void *shared, __DRIcontext *ctx,
const __GLcontextModes *fbconfig, int render_type );
+#ifndef DRI_NEW_INTERFACE_ONLY
static Bool dummyBindContext2( Display *dpy, int scrn,
GLXDrawable draw, GLXDrawable read, GLXContext gc );
@@ -113,6 +114,7 @@ static Bool dummyUnbindContext2( Display *dpy, int scrn,
assert( draw == read );
return (*gc->driContext.unbindContext)( dpy, scrn, draw, gc, GL_FALSE );
}
+#endif /* DRI_NEW_INTERFACE_ONLY */
/****************************************************************************/
@@ -154,6 +156,7 @@ static void * DriverCreateContextWrapper( const __GLXscreenConfigs *psc,
assert( (ctx_priv == NULL) || (ctx->bindContext2 != NULL)
|| (ctx->bindContext3 != NULL) );
}
+#ifndef DRI_NEW_INTERFACE_ONLY
else {
if ( vis != NULL ) {
ctx_priv = (*psc->driScreen.createContext)(dpy, vis, shared, ctx);
@@ -169,6 +172,7 @@ static void * DriverCreateContextWrapper( const __GLXscreenConfigs *psc,
}
}
}
+#endif
return ctx_priv;
}
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 1155cd92ac..397b390189 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -1523,13 +1523,14 @@ static Bool BindContextWrapper( Display *dpy, GLXContext gc,
return (*gc->driContext.bindContext3)(dpy, gc->screen, draw, read,
& gc->driContext);
}
+#ifndef DRI_NEW_INTERFACE_ONLY
else {
return (*gc->driContext.bindContext2)(dpy, gc->screen, draw, read,
gc);
}
-#else
- return GL_FALSE;
#endif
+#endif
+ return GL_FALSE;
}
@@ -1542,14 +1543,15 @@ static Bool UnbindContextWrapper( Display *dpy, GLXContext gc )
gc->currentReadable,
& gc->driContext );
}
+#ifndef DRI_NEW_INTERFACE_ONLY
else {
return (*gc->driContext.unbindContext2)(dpy, gc->screen,
gc->currentDrawable,
gc->currentReadable, gc);
}
-#else
- return GL_FALSE;
#endif
+#endif
+ return GL_FALSE;
}