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

hw/xwin: Log counts of pixel formats which couldn't be used 

Log a count of pixel formats which couldn't be used for various reasons
This commit is contained in:
Jon Turney 2014-05-09 22:09:38 +01:00
parent 82225aab81
commit a47e7eb247
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,12 @@
#endif #endif
typedef struct {
int notOpenGL;
int unknownPixelType;
int unaccelerated;
} PixelFormatRejectStats;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* /*
* Various debug helpers * Various debug helpers
@ -285,13 +291,15 @@ swap_method_name(int mthd)
} }
static void static void
fbConfigsDump(unsigned int n, __GLXconfig * c) fbConfigsDump(unsigned int n, __GLXconfig * c, PixelFormatRejectStats *rejects)
{ {
LogMessage(X_INFO, "%d fbConfigs\n", n); LogMessage(X_INFO, "%d fbConfigs\n", n);
LogMessage(X_INFO, "ignored pixel formats: %d not OpenGL, %d unknown pixel type, %d unaccelerated\n",
rejects->notOpenGL, rejects->unknownPixelType, rejects->unaccelerated);
if (g_iLogVerbose < 3) if (g_iLogVerbose < 3)
return; return;
ErrorF("%d fbConfigs\n", n);
ErrorF ErrorF
("pxf vis fb render Ste aux accum MS drawable Group/ sRGB\n"); ("pxf vis fb render Ste aux accum MS drawable Group/ sRGB\n");
ErrorF ErrorF
@ -376,7 +384,8 @@ static HDC glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw,
static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable * draw); static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable * draw);
static void glxWinCreateConfigs(HDC dc, glxWinScreen * screen); static void glxWinCreateConfigs(HDC dc, glxWinScreen * screen);
static void glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen); static void glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen,
PixelFormatRejectStats * rejects);
static int fbConfigToPixelFormat(__GLXconfig * mode, static int fbConfigToPixelFormat(__GLXconfig * mode,
PIXELFORMATDESCRIPTOR * pfdret, PIXELFORMATDESCRIPTOR * pfdret,
int drawableTypeOverride); int drawableTypeOverride);
@ -482,6 +491,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
HWND hwnd; HWND hwnd;
HDC hdc; HDC hdc;
HGLRC hglrc; HGLRC hglrc;
PixelFormatRejectStats rejects;
GLWIN_DEBUG_MSG("glxWinScreenProbe"); GLWIN_DEBUG_MSG("glxWinScreenProbe");
@ -649,8 +659,9 @@ glxWinScreenProbe(ScreenPtr pScreen)
screen->base.pScreen = pScreen; screen->base.pScreen = pScreen;
// Creating the fbConfigs initializes screen->base.fbconfigs and screen->base.numFBConfigs // Creating the fbConfigs initializes screen->base.fbconfigs and screen->base.numFBConfigs
memset(&rejects, 0, sizeof(rejects));
if (strstr(wgl_extensions, "WGL_ARB_pixel_format")) { if (strstr(wgl_extensions, "WGL_ARB_pixel_format")) {
glxWinCreateConfigsExt(hdc, screen); glxWinCreateConfigsExt(hdc, screen, &rejects);
/* /*
Some graphics drivers appear to advertise WGL_ARB_pixel_format, Some graphics drivers appear to advertise WGL_ARB_pixel_format,
@ -663,6 +674,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
} }
if (screen->base.numFBConfigs <= 0) { if (screen->base.numFBConfigs <= 0) {
memset(&rejects, 0, sizeof(rejects));
glxWinCreateConfigs(hdc, screen); glxWinCreateConfigs(hdc, screen);
screen->has_WGL_ARB_pixel_format = FALSE; screen->has_WGL_ARB_pixel_format = FALSE;
} }
@ -690,7 +702,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
DestroyWindow(hwnd); DestroyWindow(hwnd);
// dump out fbConfigs now fbConfigIds and visualIDs have been assigned // dump out fbConfigs now fbConfigIds and visualIDs have been assigned
fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs); fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs, &rejects);
/* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */ /* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */
screen->RealizeWindow = pScreen->RealizeWindow; screen->RealizeWindow = pScreen->RealizeWindow;
@ -2046,7 +2058,7 @@ getAttrValue(const int attrs[], int values[], unsigned int num, int attr,
// Create the GLXconfigs using wglGetPixelFormatAttribfvARB() extension // Create the GLXconfigs using wglGetPixelFormatAttribfvARB() extension
// //
static void static void
glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen) glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen, PixelFormatRejectStats * rejects)
{ {
GLXWinConfig *first = NULL, *prev = NULL; GLXWinConfig *first = NULL, *prev = NULL;
int i = 0; int i = 0;
@ -2157,6 +2169,7 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
#define ATTR_VALUE(a, d) getAttrValue(attrs, values, num_attrs, (a), (d)) #define ATTR_VALUE(a, d) getAttrValue(attrs, values, num_attrs, (a), (d))
if (!ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, 0)) { if (!ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, 0)) {
rejects->notOpenGL++;
GLWIN_DEBUG_MSG GLWIN_DEBUG_MSG
("pixelFormat %d isn't WGL_SUPPORT_OPENGL_ARB, skipping", ("pixelFormat %d isn't WGL_SUPPORT_OPENGL_ARB, skipping",
i + 1); i + 1);
@ -2229,6 +2242,7 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
break; break;
default: default:
rejects->unknownPixelType++;
ErrorF ErrorF
("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_PIXEL_TYPE_ARB\n", ("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_PIXEL_TYPE_ARB\n",
ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0)); ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0));
@ -2269,6 +2283,7 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
ATTR_VALUE(WGL_ACCELERATION_ARB, 0)); ATTR_VALUE(WGL_ACCELERATION_ARB, 0));
case WGL_NO_ACCELERATION_ARB: case WGL_NO_ACCELERATION_ARB:
rejects->unaccelerated++;
c->base.visualRating = GLX_SLOW_VISUAL_EXT; c->base.visualRating = GLX_SLOW_VISUAL_EXT;
GLWIN_DEBUG_MSG("pixelFormat %d is un-accelerated, skipping", i + 1); GLWIN_DEBUG_MSG("pixelFormat %d is un-accelerated, skipping", i + 1);
continue; continue;