Attachment 3778 Details for Bug 5015 – change CallCreateNewScreen to use "goto bail" instead of "nested if"

[patch] change CallCreateNewScreen to use "goto bail" instead of "nested if"

glx-c.patch (text/plain), 8.88 KB, created by George - on 2005-11-11 10:52:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-11-11 10:52:26 UTC

Size: 8.88 KB

patch

obsolete

>diff -u -x CVS -x '*.o' -x Makefile -x 'depend*' b/dri_glx.c z/dri_glx.c
>--- b/dri_glx.c	2005-10-01 13:50:59.000000000 +0300
>+++ z/dri_glx.c	2005-11-11 20:25:16.884745696 +0200
>@@ -664,18 +664,23 @@
> {
>     __DRIscreenPrivate *psp = NULL;
> #ifndef GLX_USE_APPLEGL
>+    drm_magic_t magic;
>+    drmVersionPtr version;
>+    drm_handle_t hFB;
>     drm_handle_t hSAREA;
>     drmAddress pSAREA = MAP_FAILED;
>     char *BusID;
>+    char *driverName;
>     __DRIversion   ddx_version;
>     __DRIversion   dri_version;
>     __DRIversion   drm_version;
>     __DRIframebuffer  framebuffer;
>     int   fd = -1;
>     int   status;
>-    const char * err_msg;
>-    const char * err_extra;
>-    int api_ver = __glXGetInternalVersion();
>+    int   junk;
>+
>+    const char * err_msg = NULL;
>+    const char * err_extra = NULL;
> 
> 
>     dri_version.major = driDpy->private->driMajor;
>@@ -683,162 +688,170 @@
>     dri_version.patch = driDpy->private->driPatch;
> 
> 
>-    err_msg = "XF86DRIOpenConnection";
>-    err_extra = NULL;
>-
>     framebuffer.base = MAP_FAILED;
>     framebuffer.dev_priv = NULL;
> 
>-    if (XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
>-	fd = drmOpen(NULL,BusID);
>-	Xfree(BusID); /* No longer needed */
>+    if (!XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
>+	err_msg = "XF86DRIOpenConnection";
>+	err_extra = NULL;
>+	goto bail;
>+    }
>+
>+    fd = drmOpen(NULL,BusID);
>+    Xfree(BusID); /* No longer needed */
> 
>+    if (fd < 0) {
> 	err_msg = "open DRM";
> 	err_extra = strerror( -fd );
>+	goto bail;
>+    }
>+
>+    if (drmGetMagic(fd, &magic)) {
>+	err_msg = "drmGetMagic";
>+	err_extra = NULL;
>+	goto bail;
>+    }
> 
>-	if (fd >= 0) {
>-	    drm_magic_t magic;
>+    version = drmGetVersion(fd);
>+    if (version) {
>+        drm_version.major = version->version_major;
>+        drm_version.minor = version->version_minor;
>+        drm_version.patch = version->version_patchlevel;
>+        drmFreeVersion(version);
>+    }
>+    else {
>+        drm_version.major = -1;
>+        drm_version.minor = -1;
>+        drm_version.patch = -1;
>+    }
> 
>-	    err_msg = "drmGetMagic";
>-	    err_extra = NULL;
>+    if (!XF86DRIAuthConnection(dpy, scrn, magic)) {
>+	err_msg = "XF86DRIAuthConnection";
>+	goto bail;
>+    }
> 
>-	    if (!drmGetMagic(fd, &magic)) {
>-		drmVersionPtr version = drmGetVersion(fd);
>-		if (version) {
>-		    drm_version.major = version->version_major;
>-		    drm_version.minor = version->version_minor;
>-		    drm_version.patch = version->version_patchlevel;
>-		    drmFreeVersion(version);
>-		}
>-		else {
>-		    drm_version.major = -1;
>-		    drm_version.minor = -1;
>-		    drm_version.patch = -1;
>-		}
>-
>-		err_msg = "XF86DRIAuthConnection";
>-		if (XF86DRIAuthConnection(dpy, scrn, magic)) {
>-		    char *driverName;
>-
>-		    /*
>-		     * Get device name (like "tdfx") and the ddx version
>-		     * numbers.  We'll check the version in each DRI driver's
>-		     * "createNewScreen" function.
>-		     */
>-		    err_msg = "XF86DRIGetClientDriverName";
>-		    if (XF86DRIGetClientDriverName(dpy, scrn,
>-						   &ddx_version.major,
>-						   &ddx_version.minor,
>-						   &ddx_version.patch,
>-						   &driverName)) {
>-			drm_handle_t  hFB;
>-			int        junk;
>-
>-			/* No longer needed. */
>-			Xfree( driverName );
>-
>-
>-			/*
>-			 * Get device-specific info.  pDevPriv will point to a struct
>-			 * (such as DRIRADEONRec in xfree86/driver/ati/radeon_dri.h)
>-			 * that has information about the screen size, depth, pitch,
>-			 * ancilliary buffers, DRM mmap handles, etc.
>-			 */
>-			err_msg = "XF86DRIGetDeviceInfo";
>-			if (XF86DRIGetDeviceInfo(dpy, scrn,
>-						 &hFB,
>-						 &junk,
>-						 &framebuffer.size,
>-						 &framebuffer.stride,
>-						 &framebuffer.dev_priv_size,
>-						 &framebuffer.dev_priv)) {
>-			    framebuffer.width = DisplayWidth(dpy, scrn);
>-			    framebuffer.height = DisplayHeight(dpy, scrn);
>-
>-			    /*
>-			     * Map the framebuffer region.
>-			     */
>-			    status = drmMap(fd, hFB, framebuffer.size, 
>-					    (drmAddressPtr)&framebuffer.base);
>-
>-			    err_msg = "drmMap of framebuffer";
>-			    err_extra = strerror( -status );
>-
>-			    if ( status == 0 ) {
>-				/*
>-				 * Map the SAREA region.  Further mmap regions
>-				 * may be setup in each DRI driver's
>-				 * "createNewScreen" function.
>-				 */
>-				status = drmMap(fd, hSAREA, SAREA_MAX, 
>-						&pSAREA);
>-
>-				err_msg = "drmMap of sarea";
>-				err_extra = strerror( -status );
>-
>-				if ( status == 0 ) {
>-				    __GLcontextModes * driver_modes = NULL;
>-				    __GLXscreenConfigs *configs = psc->screenConfigs;
>-
>-				    err_msg = "InitDriver";
>-				    err_extra = NULL;
>-				    psp = (*createNewScreen)(dpy, scrn,
>-							     psc,
>-							     configs->configs,
>-							     & ddx_version,
>-							     & dri_version,
>-							     & drm_version,
>-							     & framebuffer,
>-							     pSAREA,
>-							     fd,
>-							     api_ver,
>-							     & interface_methods,
>-							     & driver_modes );
>-
>-				    filter_modes( & configs->configs,
>-						  driver_modes );
>-				    _gl_context_modes_destroy( driver_modes );
>-				}
>-			    }
>-			}
>-		    }
>-		}
>-	    }
>-	}
>-    }
>-
>-    if ( psp == NULL ) {
>-	if ( pSAREA != MAP_FAILED ) {
>-	    (void)drmUnmap(pSAREA, SAREA_MAX);
>-	}
>-
>-	if ( framebuffer.base != MAP_FAILED ) {
>-	    (void)drmUnmap((drmAddress)framebuffer.base, framebuffer.size);
>-	}
>-
>-	if ( framebuffer.dev_priv != NULL ) {
>-	    Xfree(framebuffer.dev_priv);
>-	}
>-
>-	if ( fd >= 0 ) {
>-	    (void)drmClose(fd);
>-	}
>-
>-	(void)XF86DRICloseConnection(dpy, scrn);
>-
>-	if ( err_extra != NULL ) {
>-	    fprintf(stderr, "libGL error: %s failed (%s)\n", err_msg,
>-		    err_extra);
>-	}
>-	else {
>-	    fprintf(stderr, "libGL error: %s failed\n", err_msg );
>-	}
>+    /*
>+     * Get device name (like "tdfx") and the ddx version
>+     * numbers.  We'll check the version in each DRI driver's
>+     * "createNewScreen" function.
>+     */
>+    if (!XF86DRIGetClientDriverName(dpy, scrn,
>+				   &ddx_version.major,
>+				   &ddx_version.minor,
>+				   &ddx_version.patch,
>+				   &driverName)) {
>+	err_msg = "XF86DRIGetClientDriverName";
>+	goto bail;
>+    }
> 
>-        fprintf(stderr, "libGL error: reverting to (slow) indirect rendering\n");
>+    Xfree( driverName ); /* No longer needed. */
>+
>+    /*
>+     * Get device-specific info.  pDevPriv will point to a struct
>+     * (such as DRIRADEONRec in xfree86/driver/ati/radeon_dri.h)
>+     * that has information about the screen size, depth, pitch,
>+     * ancilliary buffers, DRM mmap handles, etc.
>+     */
>+    if (!XF86DRIGetDeviceInfo(dpy, scrn,
>+    			 &hFB,
>+    			 &junk,
>+    			 &framebuffer.size,
>+    			 &framebuffer.stride,
>+    			 &framebuffer.dev_priv_size,
>+    			 &framebuffer.dev_priv)) {
>+	err_msg = "XF86DRIGetDeviceInfo";
>+	goto bail;
>     }
>-#endif /* !GLX_USE_APPLEGL */
>+
>+    framebuffer.width = DisplayWidth(dpy, scrn);
>+    framebuffer.height = DisplayHeight(dpy, scrn);
>+
>+    /*
>+     * Map the framebuffer region.
>+     */
>+    status = drmMap(fd, hFB, framebuffer.size, 
>+                    (drmAddressPtr)&framebuffer.base);
>+
>+    if ( status != 0 ) {
>+	err_msg = "drmMap of framebuffer";
>+	err_extra = strerror( -status );
>+	goto bail;
>+    }
>+
>+    /*
>+     * Map the SAREA region.  Further mmap regions
>+     * may be setup in each DRI driver's
>+     * "createNewScreen" function.
>+     */
>+    status = drmMap(fd, hSAREA, SAREA_MAX, &pSAREA);
>+
>+    if ( status != 0 ) {
>+	err_msg = "drmMap of sarea";
>+	err_extra = strerror( -status );
>+	goto bail;
>+    }
>+
>+    do {
>+        __GLcontextModes * driver_modes = NULL;
>+        __GLXscreenConfigs *configs = psc->screenConfigs;
>+        int api_ver = __glXGetInternalVersion();
>+
>+        psp = (*createNewScreen)(dpy, scrn,
>+    			     psc,
>+    			     configs->configs,
>+    			     & ddx_version,
>+    			     & dri_version,
>+    			     & drm_version,
>+    			     & framebuffer,
>+    			     pSAREA,
>+    			     fd,
>+    			     api_ver,
>+    			     & interface_methods,
>+    			     & driver_modes );
>+
>+        if ( psp == NULL ) {
>+            err_msg = "InitDriver";
>+            err_extra = NULL;
>+	    goto bail;
>+        }
>+
>+        filter_modes( & configs->configs, driver_modes );
>+        _gl_context_modes_destroy( driver_modes );
>+    } while (0);
> 
>     return psp;
>+
>+bail:
>+    if ( pSAREA != MAP_FAILED ) {
>+        (void)drmUnmap(pSAREA, SAREA_MAX);
>+    }
>+    
>+    if ( framebuffer.base != MAP_FAILED ) {
>+        (void)drmUnmap((drmAddress)framebuffer.base, framebuffer.size);
>+    }
>+    
>+    if ( framebuffer.dev_priv != NULL ) {
>+        Xfree(framebuffer.dev_priv);
>+    }
>+    
>+    if ( fd >= 0 ) {
>+        (void)drmClose(fd);
>+    }
>+    
>+    (void)XF86DRICloseConnection(dpy, scrn);
>+    
>+    if ( err_extra != NULL ) {
>+        fprintf(stderr, "libGL error: %s failed (%s)\n", err_msg,
>+    	    err_extra);
>+    }
>+    else {
>+        fprintf(stderr, "libGL error: %s failed\n", err_msg );
>+    }
>+    
>+    fprintf(stderr, "libGL error: reverting to (slow) indirect rendering\n");
>+#endif /* !GLX_USE_APPLEGL */
>+
>+    return NULL;
> }
> 
> #endif /* GLX_DIRECT_RENDERING */

Actions: View | Splinter Review

Attachments on bug 5015: 3775 | 3776 | 3777 | 3778

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.