mesa: Branch 'master'

[Brian Paul]

 src/glx/x11/glxext.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

New commits:
diff-tree 702c8f1e6ca51aef356e89ee9c5f2e99a4191a8a (from f9574c3f6bd982f039b4c3ec3bb278cc3d043d29)
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Apr 9 11:21:51 2007 -0600

    remove unneeded initialization code (see bug 10569)

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 003c5ee..af3a516 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -1271,12 +1271,7 @@ __GLXdisplayPrivate *__glXInitialize(Dis
     ** Note: This _must_ be done before calling any other DRI routines
     ** (e.g., those called in AllocAndFetchScreenConfigs).
     */
-    if (getenv("LIBGL_ALWAYS_INDIRECT")) {
-        /* Assinging zero here assures we'll never go direct */
-        dpyPriv->driDisplay.private = 0;
-        dpyPriv->driDisplay.destroyDisplay = 0;
-    }
-    else {
+    if (getenv("LIBGL_ALWAYS_INDIRECT") == NULL) {
         dpyPriv->driDisplay.private =
             driCreateDisplay(dpy, &dpyPriv->driDisplay);
     }