Attachment 16363 Details for Bug 15641 – Patch adding debug output to xserver

[patch] Patch adding debug output to xserver

debug.diff (text/plain), 5.28 KB, created by Ben Gamari on 2008-05-05 08:44:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Gamari

Created: 2008-05-05 08:44:08 UTC

Size: 5.28 KB

patch

obsolete

>commit 58695bb934b1125b13b26de8e02ea49e2f4fe153
>Author: Ben Gamari <ben@mercury.(none)>
>Date:   Fri May 2 14:05:18 2008 -0400
>
>    debugging code
>
>diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
>index 9cd0738..5783a21 100644
>--- a/GL/glx/glxdri.c
>+++ b/GL/glx/glxdri.c
>@@ -960,6 +960,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
>     const __DRIextension **extensions;
>     int i;
> 
>+    ErrorF("In __glXDRIscreenProbe.\n");
>+
>     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
> 	!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
> 	!isCapable) {
>diff --git a/GL/glx/glxdri2.c b/GL/glx/glxdri2.c
>index 40590c1..f476e9a 100644
>--- a/GL/glx/glxdri2.c
>+++ b/GL/glx/glxdri2.c
>@@ -617,6 +617,8 @@ glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs)
>     __GLXconfig head, *tail;
>     int i;
> 
>+		ErrorF("In glxConvertConfigs.\n");
>+		
>     tail = &head;
>     head.next = NULL;
> 
>diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
>index c8a2514..4a34b1a 100644
>--- a/GL/glx/glxglcore.c
>+++ b/GL/glx/glxglcore.c
>@@ -312,6 +312,8 @@ createFBConfigsForVisual(__GLXscreen *screen, ScreenPtr pScreen,
> {
>     int back, depth, stencil;
> 
>+  	ErrorF("Creating FBConfigs for visual 0x%x.\n", visual->vid);
>+  	
>     /* FIXME: Ok, I'm making all this up... anybody has a better idea? */
> 
>     for (back = numBack - 1; back >= 0; back--)
>@@ -361,6 +363,8 @@ createFBConfigs(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
>      * its visual, so it's not entirely crazy. */
>     pGlxScreen->numFBConfigs = pScreen->numVisuals * numBack * numDepth * numStencil;
>     
>+    ErrorF("In createFBConfigs: Creating FBConfigs for %d visuals.\n", pScreen->numVisuals);
>+
>     head.next = NULL;
>     tail = &head;
>     for (i = 0; i < pScreen->numVisuals; i++)
>@@ -378,6 +382,8 @@ createMesaVisuals(__GLXMESAscreen *pMesaScreen)
>     VisualPtr visual = NULL;
>     int i, j;
> 
>+ErrorF("In createMesaVisuals.\n");
>+
>     i = 0;
>     pScreen = pMesaScreen->base.pScreen;
>     pMesaScreen->xm_vis =
>@@ -418,6 +424,7 @@ __glXMesaScreenProbe(ScreenPtr pScreen)
>     if (screen == NULL)
> 	return NULL;
> 
>+    ErrorF("In __glXMesaScreenProbe.\n");
>     /*
>      * Find the GLX visuals that are supported by this screen and create
>      * XMesa's visuals.
>diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
>index 41ee029..a979039 100644
>--- a/GL/glx/glxscreens.c
>+++ b/GL/glx/glxscreens.c
>@@ -307,6 +307,7 @@ filterOutNativeConfigs(__GLXscreen *pGlxScreen)
> 
> 	for (i = 0; i < pScreen->numVisuals; i++) {
> 	    if (pScreen->visuals[i].nplanes == depth) {
>+	    	ErrorF("Visual 0x%x (0x%x) is native.\n", m->visualID, pScreen->visuals[i].vid);
> 		*last = m;
> 		last = &m->next;
> 		break;
>@@ -432,6 +433,8 @@ initGlxVisual(VisualPtr visual, __GLXconfig *config)
>     visual->offsetRed = findFirstSet(config->redMask);
>     visual->offsetGreen = findFirstSet(config->greenMask);
>     visual->offsetBlue = findFirstSet(config->blueMask);
>+    
>+    ErrorF("Initializing visual 0x%x: Planes: %d.\n", visual->vid, visual->nplanes);
> }
> 
> typedef struct {
>@@ -514,6 +517,7 @@ addFullSet(__GLXscreen *pGlxScreen)
> 	ErrorF("Failed to allocate for full set of GLX visuals\n");
> 	return;
>     }
>+    ErrorF("Adding full set of GLX visuals (%d visuals)\n", pGlxScreen->numFBConfigs);
> 
>     config = pGlxScreen->fbconfigs;
>     depth = config->redBits + config->greenBits + config->blueBits;
>@@ -541,7 +545,7 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
> {
>     __GLXconfig *m;
>     int i;
>-
>+ErrorF("In __glXScreenInit\n");
>     pGlxScreen->pScreen       = pScreen;
>     pGlxScreen->GLextensions  = xstrdup(GLServerExtensions);
>     pGlxScreen->GLXvendor     = xstrdup(GLXServerVendorName);
>diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
>index de8bef8..cb650c3 100644
>--- a/hw/dmx/glxProxy/glxext.c
>+++ b/hw/dmx/glxProxy/glxext.c
>@@ -271,7 +271,8 @@ void GlxExtensionInit(void)
>     ExtensionEntry *extEntry;
>     int i;
>     int glxSupported = 1;
>-
>+    
>+    ErrorF("In GlxExtensionInit\n");
>     /*
>     // do not initialize GLX extension if GLX is not supported
>     // by ALL back-end servers.
>diff --git a/hw/xfree86/utils/Makefile.am b/hw/xfree86/utils/Makefile.am
>index e3e7a61..dd3bcc3 100644
>--- a/hw/xfree86/utils/Makefile.am
>+++ b/hw/xfree86/utils/Makefile.am
>@@ -1,6 +1,5 @@
> SUBDIRS = \
> 	gtf \
>-	cvt \
> 	ioport \
> 	kbd_mode \
> 	xorgcfg \
>diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am
>index 4db175f..4d45a02 100644
>--- a/hw/xfree86/utils/cvt/Makefile.am
>+++ b/hw/xfree86/utils/cvt/Makefile.am
>@@ -34,7 +34,7 @@ INCLUDES = $(XORG_INCS) \
> DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
> 
> # gah
>-cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/modes/xf86cvt.c
>+cvt_SOURCES = cvt.c 
> cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
> cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a
> 
>diff --git a/mi/mipointer.c b/mi/mipointer.c
>index b55e68b..db29082 100644
>--- a/mi/mipointer.c
>+++ b/mi/mipointer.c
>@@ -412,7 +412,8 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
>     SetupScreen(pScreen);
> 
>     if (pDev && (pDev->coreEvents || pDev == inputInfo.pointer) &&
>-        !pScreenPriv->waitForUpdate && pScreen == miPointer.pSpriteScreen)
>+        pScreenPriv && !pScreenPriv->waitForUpdate &&
>+	pScreen == miPointer.pSpriteScreen)
>     {
> 	miPointer.devx = x;
> 	miPointer.devy = y;

Actions: View | Splinter Review

Attachments on bug 15641: 16092 | 16093 | 16362 | 16363 | 16744 | 16766 | 16767

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.