summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-03-15 18:43:25 +0000
committerBrian Paul <[email protected]>2002-03-15 18:43:25 +0000
commit8d687e7e58a148f3f16573636023e54755372010 (patch)
tree15350918ab6a888283613df4482f039e7f803fc0 /src/mesa
parent1d822ea8cfa765802fe63b1a5d8d2bd83118007f (diff)
protect currentReadable reference with #ifndef GLX_BUILT_IN_XMESA
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index af94222b767..1b5aeee44ad 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,10 +1,10 @@
-/* $Id: fakeglx.c,v 1.60 2002/03/15 18:24:53 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.61 2002/03/15 18:43:25 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 4.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -1233,8 +1233,9 @@ Fake_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
if (XMesaMakeCurrent2(xmctx, drawBuffer, readBuffer)) {
((__GLXcontext *) ctx)->currentDpy = dpy;
((__GLXcontext *) ctx)->currentDrawable = draw;
+#ifndef GLX_BUILT_IN_XMESA
((__GLXcontext *) ctx)->currentReadable = read;
-#ifdef GLX_BUILT_IN_XMESA
+#else
__glXSetCurrentContext(ctx);
#endif
return True;