diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-04 13:16:13 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-04 13:16:13 -0600 |
| commit | 9d58724c51c387c360d2423e29b80ddc0bfa66b7 (patch) | |
| tree | 774f69454bca802e1fe8e20ebb2a130843ca8123 /progs/wgl | |
| parent | 81a0ef3f2068448a8b544826eaa7d3382b9c769b (diff) | |
| parent | 9424d81d18770f0c436f0876dffe07cf7c094db4 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/context.c
Diffstat (limited to 'progs/wgl')
| -rw-r--r-- | progs/wgl/wglinfo.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/progs/wgl/wglinfo.c b/progs/wgl/wglinfo.c index 881d35b297..864372c2f9 100644 --- a/progs/wgl/wglinfo.c +++ b/progs/wgl/wglinfo.c @@ -348,7 +348,6 @@ print_screen_info(HDC _hdc, GLboolean limits) HWND win; HGLRC ctx; int visinfo; - int width = 100, height = 100; HDC hdc; PIXELFORMATDESCRIPTOR pfd; @@ -364,18 +363,18 @@ print_screen_info(HDC _hdc, GLboolean limits) win = CreateWindowEx(0, wc.lpszClassName, "wglinfo", - WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - width, - height, NULL, NULL, wc.hInstance, NULL); if (!win) { fprintf(stderr, "Couldn't create window"); - exit(1); + return; } hdc = GetDC(win); @@ -476,7 +475,7 @@ print_visual_attribs_verbose(int iPixelFormat, LPPIXELFORMATDESCRIPTOR ppfd) ppfd->dwFlags & PFD_DRAW_TO_WINDOW ? 1 : 0); printf(" bufferSize=%d level=%d renderType=%s doubleBuffer=%d stereo=%d\n", 0 /* ppfd->bufferSize */, 0 /* ppfd->level */, - visual_render_type_name(ppfd->dwFlags), + visual_render_type_name(ppfd->iPixelType), ppfd->dwFlags & PFD_DOUBLEBUFFER ? 1 : 0, ppfd->dwFlags & PFD_STEREO ? 1 : 0); printf(" rgba: cRedBits=%d cGreenBits=%d cBlueBits=%d cAlphaBits=%d\n", |