Mesa (master): glx: Re-indent CreateContext after the previous commit

[Ian Romanick]

Module: Mesa
Branch: master
Commit: bc7b2f0dc33753f6d6b55bd4058e82ddf0997967
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc7b2f0dc33753f6d6b55bd4058e82ddf0997967

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Feb  4 16:46:46 2010 -0800

glx: Re-indent CreateContext after the previous commit

---

 src/glx/glxcmds.c |  191 ++++++++++++++++++++++++++---------------------------
 1 files changed, 95 insertions(+), 96 deletions(-)

diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 48f7049..b08cad8 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -382,113 +382,112 @@ CreateContext(Display * dpy, XVisualInfo * vis,
    if (!gc)
       return NULL;
 
-      if ((vis == NULL) && (fbconfig == NULL))
-         return NULL;
+   if ((vis == NULL) && (fbconfig == NULL))
+      return NULL;
 
 #ifdef GLX_DIRECT_RENDERING
-      if (allowDirect && psc->driScreen) {
-         const __GLcontextModes *mode;
-
-         if (fbconfig == NULL) {
-            mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid);
-            if (mode == NULL) {
-               xError error;
-
-               error.errorCode = BadValue;
-               error.resourceID = vis->visualid;
-               error.sequenceNumber = dpy->request;
-               error.type = X_Error;
-               error.majorCode = gc->majorOpcode;
-               error.minorCode = X_GLXCreateContext;
-               _XError(dpy, &error);
-               return None;
-            }
-            if (renderType == 0) {
-               /* Initialize renderType now */
-               renderType = mode->rgbMode ? GLX_RGBA_TYPE : GLX_COLOR_INDEX_TYPE;
-            }
-         }
-         else {
-            mode = fbconfig;
-         }
+   if (allowDirect && psc->driScreen) {
+      const __GLcontextModes *mode;
+
+      if (fbconfig == NULL) {
+	 mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid);
+	 if (mode == NULL) {
+	    xError error;
+
+	    error.errorCode = BadValue;
+	    error.resourceID = vis->visualid;
+	    error.sequenceNumber = dpy->request;
+	    error.type = X_Error;
+	    error.majorCode = gc->majorOpcode;
+	    error.minorCode = X_GLXCreateContext;
+	    _XError(dpy, &error);
+	    return None;
+	 }
+	 if (renderType == 0) {
+	    /* Initialize renderType now */
+	    renderType = mode->rgbMode ? GLX_RGBA_TYPE : GLX_COLOR_INDEX_TYPE;
+	 }
+      }
+      else {
+	 mode = fbconfig;
+      }
 
-         gc->driContext = psc->driScreen->createContext(psc, mode, gc,
-                                                        shareList,
-                                                        renderType);
-         if (gc->driContext != NULL) {
-            gc->screen = mode->screen;
-            gc->psc = psc;
-            gc->mode = mode;
-            gc->isDirect = GL_TRUE;
-         }
+      gc->driContext = psc->driScreen->createContext(psc, mode, gc, shareList,
+						     renderType);
+      if (gc->driContext != NULL) {
+	 gc->screen = mode->screen;
+	 gc->psc = psc;
+	 gc->mode = mode;
+	 gc->isDirect = GL_TRUE;
       }
+   }
 #endif
 
-      LockDisplay(dpy);
-      switch (code) {
-      case X_GLXCreateContext: {
-         xGLXCreateContextReq *req;
-
-         /* Send the glXCreateContext request */
-         GetReq(GLXCreateContext, req);
-         req->reqType = gc->majorOpcode;
-         req->glxCode = X_GLXCreateContext;
-         req->context = gc->xid = XAllocID(dpy);
-         req->visual = vis->visualid;
-         req->screen = vis->screen;
-         req->shareList = shareList ? shareList->xid : None;
-         req->isDirect = GC_IS_DIRECT(gc);
-	 break;
-      }
+   LockDisplay(dpy);
+   switch (code) {
+   case X_GLXCreateContext: {
+      xGLXCreateContextReq *req;
+
+      /* Send the glXCreateContext request */
+      GetReq(GLXCreateContext, req);
+      req->reqType = gc->majorOpcode;
+      req->glxCode = X_GLXCreateContext;
+      req->context = gc->xid = XAllocID(dpy);
+      req->visual = vis->visualid;
+      req->screen = vis->screen;
+      req->shareList = shareList ? shareList->xid : None;
+      req->isDirect = GC_IS_DIRECT(gc);
+      break;
+   }
 
-      case X_GLXCreateNewContext: {
-         xGLXCreateNewContextReq *req;
-
-         /* Send the glXCreateNewContext request */
-         GetReq(GLXCreateNewContext, req);
-         req->reqType = gc->majorOpcode;
-         req->glxCode = X_GLXCreateNewContext;
-         req->context = gc->xid = XAllocID(dpy);
-         req->fbconfig = fbconfig->fbconfigID;
-         req->screen = fbconfig->screen;
-         req->renderType = renderType;
-         req->shareList = shareList ? shareList->xid : None;
-         req->isDirect = GC_IS_DIRECT(gc);
-	 break;
-      }
+   case X_GLXCreateNewContext: {
+      xGLXCreateNewContextReq *req;
 
-      case X_GLXvop_CreateContextWithConfigSGIX: {
-         xGLXVendorPrivateWithReplyReq *vpreq;
-         xGLXCreateContextWithConfigSGIXReq *req;
-
-         /* Send the glXCreateNewContext request */
-         GetReqExtra(GLXVendorPrivateWithReply,
-                     sz_xGLXCreateContextWithConfigSGIXReq -
-                     sz_xGLXVendorPrivateWithReplyReq, vpreq);
-         req = (xGLXCreateContextWithConfigSGIXReq *) vpreq;
-         req->reqType = gc->majorOpcode;
-         req->glxCode = X_GLXVendorPrivateWithReply;
-         req->vendorCode = X_GLXvop_CreateContextWithConfigSGIX;
-         req->context = gc->xid = XAllocID(dpy);
-         req->fbconfig = fbconfig->fbconfigID;
-         req->screen = fbconfig->screen;
-         req->renderType = renderType;
-         req->shareList = shareList ? shareList->xid : None;
-         req->isDirect = GC_IS_DIRECT(gc);
-	 break;
-      }
+      /* Send the glXCreateNewContext request */
+      GetReq(GLXCreateNewContext, req);
+      req->reqType = gc->majorOpcode;
+      req->glxCode = X_GLXCreateNewContext;
+      req->context = gc->xid = XAllocID(dpy);
+      req->fbconfig = fbconfig->fbconfigID;
+      req->screen = fbconfig->screen;
+      req->renderType = renderType;
+      req->shareList = shareList ? shareList->xid : None;
+      req->isDirect = GC_IS_DIRECT(gc);
+      break;
+   }
 
-      default:
-	 /* What to do here?  This case is the sign of an internal error.  It
-	  * should never be reachable.
-	  */
-	 break;
-      }
+   case X_GLXvop_CreateContextWithConfigSGIX: {
+      xGLXVendorPrivateWithReplyReq *vpreq;
+      xGLXCreateContextWithConfigSGIXReq *req;
 
-      UnlockDisplay(dpy);
-      SyncHandle();
-      gc->imported = GL_FALSE;
+      /* Send the glXCreateNewContext request */
+      GetReqExtra(GLXVendorPrivateWithReply,
+		  sz_xGLXCreateContextWithConfigSGIXReq -
+		  sz_xGLXVendorPrivateWithReplyReq, vpreq);
+      req = (xGLXCreateContextWithConfigSGIXReq *) vpreq;
+      req->reqType = gc->majorOpcode;
+      req->glxCode = X_GLXVendorPrivateWithReply;
+      req->vendorCode = X_GLXvop_CreateContextWithConfigSGIX;
+      req->context = gc->xid = XAllocID(dpy);
+      req->fbconfig = fbconfig->fbconfigID;
+      req->screen = fbconfig->screen;
+      req->renderType = renderType;
+      req->shareList = shareList ? shareList->xid : None;
+      req->isDirect = GC_IS_DIRECT(gc);
+      break;
+   }
+
+   default:
+      /* What to do here?  This case is the sign of an internal error.  It
+       * should never be reachable.
+       */
+      break;
+   }
+
+   UnlockDisplay(dpy);
+   SyncHandle();
 
+   gc->imported = GL_FALSE;
    gc->renderType = renderType;
 
    return gc;