frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Don't log all fbConfigs and GL/WGL extensions 

Don't log all fbConfigs and GL/WGL extensions, unless verbose logging
is requested
Log the number of pixelFormats which gave rise to the fbConfigs

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-06-25 15:58:21 +01:00
parent 9b10f20f47
commit 886f4c3892
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xwin/glx/indirect.c
View File

@ -86,6 +86,7 @@
#include <winpriv.h> #include <winpriv.h>
#include <wgl_ext_api.h> #include <wgl_ext_api.h>
#include <winglobals.h>
#define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1])) #define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1]))
@ -341,6 +342,10 @@ swap_method_name(int mthd)
static void static void
fbConfigsDump(unsigned int n, __GLXconfig * c) fbConfigsDump(unsigned int n, __GLXconfig * c)
{ {
LogMessage(X_INFO, "%d fbConfigs\n", n);
if (g_iLogVerbose < 3)
return;
ErrorF("%d fbConfigs\n", n); ErrorF("%d fbConfigs\n", n);
ErrorF ErrorF
("pxf vis fb render Ste aux accum MS drawable Group/\n"); ("pxf vis fb render Ste aux accum MS drawable Group/\n");
@ -595,11 +600,14 @@ glxWinScreenProbe(ScreenPtr pScreen)
gl_renderer = (const char *) glGetStringWrapperNonstatic(GL_RENDERER); gl_renderer = (const char *) glGetStringWrapperNonstatic(GL_RENDERER);
ErrorF("GL_RENDERER: %s\n", gl_renderer); ErrorF("GL_RENDERER: %s\n", gl_renderer);
gl_extensions = (const char *) glGetStringWrapperNonstatic(GL_EXTENSIONS); gl_extensions = (const char *) glGetStringWrapperNonstatic(GL_EXTENSIONS);
glxLogExtensions("GL_EXTENSIONS: ", gl_extensions);
wgl_extensions = wglGetExtensionsStringARBWrapper(hdc); wgl_extensions = wglGetExtensionsStringARBWrapper(hdc);
if (!wgl_extensions) if (!wgl_extensions)
wgl_extensions = ""; wgl_extensions = "";
if (g_iLogVerbose >= 3) {
glxLogExtensions("GL_EXTENSIONS: ", gl_extensions);
glxLogExtensions("WGL_EXTENSIONS: ", wgl_extensions); glxLogExtensions("WGL_EXTENSIONS: ", wgl_extensions);
}
if (strcasecmp(gl_renderer, "GDI Generic") == 0) { if (strcasecmp(gl_renderer, "GDI Generic") == 0) {
free(screen); free(screen);
@ -1835,7 +1843,7 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
// get the number of pixelformats // get the number of pixelformats
numConfigs = numConfigs =
DescribePixelFormat(hdc, 1, sizeof(PIXELFORMATDESCRIPTOR), NULL); DescribePixelFormat(hdc, 1, sizeof(PIXELFORMATDESCRIPTOR), NULL);
GLWIN_DEBUG_MSG("DescribePixelFormat says %d possible pixel formats", LogMessage(X_INFO, "%d pixel formats reported by DescribePixelFormat\n",
numConfigs); numConfigs);
/* alloc */ /* alloc */
@ -2083,8 +2091,8 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
return; return;
} }
GLWIN_DEBUG_MSG LogMessage(X_INFO,
("wglGetPixelFormatAttribivARB says %d possible pixel formats", "%d pixel formats reported by wglGetPixelFormatAttribivARB\n",
numConfigs); numConfigs);
/* alloc */ /* alloc */