diff options
Diffstat (limited to 'xorg-server/hw/xwin/winengine.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/hw/xwin/winengine.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c index b2007d751..cf8a526a5 100644..100755 --- a/xorg-server/hw/xwin/winengine.c +++ b/xorg-server/hw/xwin/winengine.c @@ -85,13 +85,13 @@ winDetectSupportedEngines(void) ddrval = (*g_fpDirectDrawCreate) (NULL, (void **) &lpdd, NULL); if (FAILED(ddrval)) { /* No DirectDraw support */ - winErrorFVerb(2, + winDebug ( "winDetectSupportedEngines - DirectDraw not installed\n"); return; } else { /* We have DirectDraw */ - winErrorFVerb(2, + winDebug ( "winDetectSupportedEngines - DirectDraw installed, allowing ShadowDD\n"); g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD; @@ -99,7 +99,7 @@ winDetectSupportedEngines(void) /* Allow PrimaryDD engine if NT */ if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) { g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD; - winErrorFVerb(2, + winDebug ( "winDetectSupportedEngines - Windows NT, allowing PrimaryDD\n"); } #endif @@ -111,7 +111,7 @@ winDetectSupportedEngines(void) (LPVOID *) & lpdd4); if (SUCCEEDED(ddrval)) { /* We have DirectDraw4 */ - winErrorFVerb(2, + winDebug ( "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n"); g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL; } @@ -123,7 +123,7 @@ winDetectSupportedEngines(void) IDirectDraw_Release(lpdd); } - winErrorFVerb(2, + winDebug ( "winDetectSupportedEngines - Returning, supported engines %08x\n", (unsigned int) g_dwEnginesSupported); } @@ -162,7 +162,7 @@ winSetEngine(ScreenPtr pScreen) /* ShadowGDI is the only engine that supports windowed PseudoColor */ if (dwBPP == 8 && !pScreenInfo->fFullScreen) { - winErrorFVerb(2, + winDebug ( "winSetEngine - Windowed && PseudoColor => ShadowGDI\n"); pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI; @@ -180,7 +180,7 @@ winSetEngine(ScreenPtr pScreen) || pScreenInfo->fMultiWindow #endif ) { - winErrorFVerb(2, + winDebug ( "winSetEngine - Multi Window or Rootless => ShadowGDI\n"); pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI; @@ -189,9 +189,9 @@ winSetEngine(ScreenPtr pScreen) return TRUE; } - /* If the user's choice is supported, we'll use that */ - if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred) { - winErrorFVerb(2, "winSetEngine - Using user's preference: %d\n", + /* If there is a user's choice, we'll use that */ + if (pScreenInfo->dwEnginePreferred) { + winDebug ("winSetEngine - Using user's preference: %d\n", (int) pScreenInfo->dwEnginePreferred); pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred; @@ -217,14 +217,14 @@ winSetEngine(ScreenPtr pScreen) break; #endif default: - FatalError("winSetEngine - Invalid engine type\n"); + FatalError ("winSetEngine - Invalid engine type %d\n",pScreenInfo->dwEngine); } return TRUE; } /* ShadowDDNL has good performance, so why not */ if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL) { - winErrorFVerb(2, "winSetEngine - Using Shadow DirectDraw NonLocking\n"); + winDebug ("winSetEngine - Using Shadow DirectDraw NonLocking\n"); pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL; /* Set engine function pointers */ @@ -234,7 +234,7 @@ winSetEngine(ScreenPtr pScreen) /* ShadowDD is next in line */ if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD) { - winErrorFVerb(2, "winSetEngine - Using Shadow DirectDraw\n"); + winDebug ("winSetEngine - Using Shadow DirectDraw\n"); pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD; /* Set engine function pointers */ @@ -244,7 +244,7 @@ winSetEngine(ScreenPtr pScreen) /* ShadowGDI is next in line */ if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI) { - winErrorFVerb(2, "winSetEngine - Using Shadow GDI DIB\n"); + winDebug ("winSetEngine - Using Shadow GDI DIB\n"); pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI; /* Set engine function pointers */ |