From 3873be16d050ab12fc78f1e7f0c36c2ac88d0a98 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 11 Oct 2010 16:21:40 +0100 Subject: [PATCH] hw/xwin/glx: Fix fbconfig dumper formatting for 3 digit index numbers Some graphics hardware supports hundreds of pixel formats, so adjust formatting in fbconfig dumper for 3 digit index numbers Also report the PFD_SUPPORT_DIRECTDRAW, PFD_DIRECT3D_ACCELERATED and PFD_SUPPORT_COMPOSITION flags introduced with aero Reviewed-by: Colin Harrison Signed-off-by: Jon TURNEY --- hw/xwin/glx/indirect.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index bd2a1ad30..720b2f00c 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -80,6 +80,17 @@ #define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1])) +/* Not yet in w32api */ +#ifndef PFD_SUPPORT_DIRECTDRAW +#define PFD_SUPPORT_DIRECTDRAW 0x00002000 +#endif +#ifndef PFD_DIRECT3D_ACCELERATED +#define PFD_DIRECT3D_ACCELERATED 0x00004000 +#endif +#ifndef PFD_SUPPORT_COMPOSITION +#define PFD_SUPPORT_COMPOSITION 0x00008000 +#endif + /* ---------------------------------------------------------------------- */ /* * structure definitions @@ -247,6 +258,9 @@ static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd) DUMP_PFD_FLAG(PFD_SWAP_COPY); DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS); DUMP_PFD_FLAG(PFD_GENERIC_ACCELERATED); + DUMP_PFD_FLAG(PFD_SUPPORT_DIRECTDRAW); + DUMP_PFD_FLAG(PFD_DIRECT3D_ACCELERATED); + DUMP_PFD_FLAG(PFD_SUPPORT_COMPOSITION); DUMP_PFD_FLAG(PFD_DEPTH_DONTCARE); DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE); DUMP_PFD_FLAG(PFD_STEREO_DONTCARE); @@ -328,7 +342,7 @@ fbConfigsDump(unsigned int n, __GLXconfig *c) { unsigned int i = ((GLXWinConfig *)c)->pixelFormatIndex; - ErrorF("%3d %2x %2x " + ErrorF("%3d %3x %3x " "%-11s" " %3d %3d %s %s %s %s %s " "%2d %2d %2d %2d "