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

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 <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon TURNEY 2010-10-11 16:21:40 +01:00
parent d4096abb59
commit 3873be16d0
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,17 @@
#define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1])) #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 * structure definitions
@ -247,6 +258,9 @@ static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd)
DUMP_PFD_FLAG(PFD_SWAP_COPY); DUMP_PFD_FLAG(PFD_SWAP_COPY);
DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS); DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS);
DUMP_PFD_FLAG(PFD_GENERIC_ACCELERATED); 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_DEPTH_DONTCARE);
DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE); DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE);
DUMP_PFD_FLAG(PFD_STEREO_DONTCARE); DUMP_PFD_FLAG(PFD_STEREO_DONTCARE);
@ -328,7 +342,7 @@ fbConfigsDump(unsigned int n, __GLXconfig *c)
{ {
unsigned int i = ((GLXWinConfig *)c)->pixelFormatIndex; unsigned int i = ((GLXWinConfig *)c)->pixelFormatIndex;
ErrorF("%3d %2x %2x " ErrorF("%3d %3x %3x "
"%-11s" "%-11s"
" %3d %3d %s %s %s %s %s " " %3d %3d %s %s %s %s %s "
"%2d %2d %2d %2d " "%2d %2d %2d %2d "