diff options
| author | Brian Paul <[email protected]> | 2010-06-24 14:10:24 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-06-25 08:47:33 -0600 |
| commit | a879d14ecf818d767f5da9dd7fd3b0cd8816cf29 (patch) | |
| tree | 3ea18cefafc97564458fa8bc281180737cc107bb | |
| parent | cc8c142e2ab3575f864bba9e634ec87995aad601 (diff) | |
mesa: initialize extension string when context is first bound
...instead of waiting until glGetString(GL_EXTENSIONS) is called.
This fixes a problem where the MESA_EXTENSION_OVERRIDE env var is
ignored if the app never calls glGetString(GL_EXTENSIONS).
NOTE: this is a candidate patch for the 7.8 branch.
| -rw-r--r-- | src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/getstring.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 0afd77d3759..f597b23194e 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1462,6 +1462,8 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, if (newCtx->FirstTimeCurrent) { _mesa_compute_version(newCtx); + newCtx->Extensions.String = _mesa_make_extension_string(newCtx); + check_context_limits(newCtx); /* We can use this to help debug user's problems. Tell them to set diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 54db5794bf6..7961ad7e7dd 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -95,8 +95,6 @@ _mesa_GetString( GLenum name ) case GL_VERSION: return (const GLubyte *) ctx->VersionString; case GL_EXTENSIONS: - if (!ctx->Extensions.String) - ctx->Extensions.String = _mesa_make_extension_string(ctx); return (const GLubyte *) ctx->Extensions.String; #if FEATURE_ARB_shading_language_100 || FEATURE_ES2 case GL_SHADING_LANGUAGE_VERSION: |