diff options
| author | Keith Whitwell <[email protected]> | 2009-02-10 19:22:57 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-02-10 19:22:57 +0000 |
| commit | 9c9ba66fbae8089e9423f6b09ad1091cccf9b006 (patch) | |
| tree | 81ecce3d6b19e5b77fcf31e5f081e1c546f398b9 /src/glut/glx/win32_glx.c | |
| parent | ebb864da9e98003be9ea388013ae4385d341e46f (diff) | |
| parent | 1e8177ee178b131afa86d874b062a8ae3fae0cca (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
Diffstat (limited to 'src/glut/glx/win32_glx.c')
| -rw-r--r-- | src/glut/glx/win32_glx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glut/glx/win32_glx.c b/src/glut/glx/win32_glx.c index ecfff44b930..3522e606ec8 100644 --- a/src/glut/glx/win32_glx.c +++ b/src/glut/glx/win32_glx.c @@ -22,7 +22,7 @@ glXCreateContext(Display * display, XVisualInfo * visinfo, routine. */ HGLRC context; - context = CreateContext(XHDC); + context = wglCreateContext(XHDC); #if 0 /* XXX GLUT doesn't support it now, so don't worry about display list |