diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-10-11 16:21:40 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-10-12 17:59:58 +0100 |
| commit | 3925c2369d6b1e1aab09ad59ae0ee35fdfa591ae (patch) | |
| tree | b7049e7094bb40f5e44c6a279d759a27382bb742 | |
| parent | 7294bf7b487627a7969a479c4c95381030486e15 (diff) | |
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 PFD_SUPPORT_COMPOSITON flag introduced with aero
| -rwxr-xr-x | hw/xwin/glx/indirect.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index 1cf82a7cc..b745b5b63 100755 --- 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 " |