diff options
| author | Brian <[email protected]> | 2007-03-09 11:43:53 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-03-09 11:43:53 -0700 |
| commit | 2cf5fd48d1586f961910a14324a457854cb66221 (patch) | |
| tree | 6b8690b1e3ac2b59369356d692214cc7d6a889c6 /progs/demos | |
| parent | 9f44247acf62b91669f77974a4bbad687d58859e (diff) | |
| parent | f9f79c8d770e696249bd98c68b563f887562c974 (diff) | |
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/context.c
Diffstat (limited to 'progs/demos')
| -rw-r--r-- | progs/demos/winpos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/demos/winpos.c b/progs/demos/winpos.c index 2ee1df69fbc..3a1a19ecdb9 100644 --- a/progs/demos/winpos.c +++ b/progs/demos/winpos.c @@ -77,7 +77,7 @@ static void init( void ) WindowPosFunc = &glWindowPos2fARB; } else -#elif defined(GL_ARB_window_pos) +#elif defined(GL_MESA_window_pos) if (glutExtensionSupported("GL_MESA_window_pos")) { printf("Using GL_MESA_window_pos\n"); WindowPosFunc = &glWindowPos2fMESA; |