diff options
author | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
commit | 2bf95c519e755146704f4942b1703d47d18bfeaa (patch) | |
tree | 9d29c5d56014377013770615611f903cd5b25292 /src/gallium/targets | |
parent | f36846c77ee196881c0da560229279fc7ed88170 (diff) | |
parent | 8042d751debb7a8375e8bc587189fea9a5a8371d (diff) |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/graw-gdi/graw_gdi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/targets/graw-gdi/graw_gdi.c b/src/gallium/targets/graw-gdi/graw_gdi.c index 17ca2a761ca..99d8641d6b1 100644 --- a/src/gallium/targets/graw-gdi/graw_gdi.c +++ b/src/gallium/targets/graw-gdi/graw_gdi.c @@ -66,7 +66,7 @@ graw_create_window_and_screen(int x, { struct sw_winsys *winsys = NULL; struct pipe_screen *screen = NULL; - WNDCLASSEX wc = {sizeof(wc)}; + WNDCLASSEX wc; UINT style = WS_VISIBLE | WS_TILEDWINDOW; RECT rect; HWND hWnd = NULL; @@ -83,6 +83,8 @@ graw_create_window_and_screen(int x, if (screen == NULL) goto fail; + memset(&wc, 0, sizeof wc); + wc.cbSize = sizeof wc; wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = window_proc; wc.lpszClassName = "graw-gdi"; |