diff options
author | Brian <brian.paul@tungstengraphics.com> | 2007-08-22 18:35:50 -0600 |
---|---|---|
committer | Brian <brian.paul@tungstengraphics.com> | 2007-08-22 18:52:40 -0600 |
commit | fa8cbc45e883762f3c3f1f11497a035c217f8d65 (patch) | |
tree | c3cf20f0c35d799eb76cb864ddf06f3c8a2d21c2 /src/mesa/state_tracker/st_cb_strings.c | |
parent | e9190ec534abb817d4f5d1660c84a0ace3376c84 (diff) | |
download | external_mesa3d-fa8cbc45e883762f3c3f1f11497a035c217f8d65.zip external_mesa3d-fa8cbc45e883762f3c3f1f11497a035c217f8d65.tar.gz external_mesa3d-fa8cbc45e883762f3c3f1f11497a035c217f8d65.tar.bz2 |
Need to store vendor and renderer strings in the context.
As it was, we always returned the same pointer. So glxinfo, which calls
glGetString() before printing anything, was printing the same string for
both vendor and renderer.
Diffstat (limited to 'src/mesa/state_tracker/st_cb_strings.c')
-rw-r--r-- | src/mesa/state_tracker/st_cb_strings.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c index ac1a8b1..776f518 100644 --- a/src/mesa/state_tracker/st_cb_strings.c +++ b/src/mesa/state_tracker/st_cb_strings.c @@ -46,8 +46,6 @@ st_get_string(GLcontext * ctx, GLenum name) { struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; - static char buffer[128]; - switch (name) { case GL_VENDOR: { @@ -59,20 +57,20 @@ st_get_string(GLcontext * ctx, GLenum name) * additional string allows "and XyzCorp" to reflect this. */ if (vendor && strcmp(vendor, tungsten) != 0) - snprintf(buffer, sizeof(buffer), "%s and %s", tungsten, vendor); + snprintf(st->vendor, sizeof(st->vendor), + "%s and %s", tungsten, vendor); else - snprintf(buffer, sizeof(buffer), "%s", tungsten); + snprintf(st->vendor, sizeof(st->vendor), "%s", tungsten); - return (GLubyte *) buffer; - break; + return (GLubyte *) st->vendor; } case GL_RENDERER: - snprintf(buffer, sizeof(buffer), "TG3D, %s on %s", + snprintf(st->renderer, sizeof(st->renderer), "TG3D, %s on %s", pipe->get_name( pipe ), pipe->winsys->get_name( pipe->winsys )); - return (GLubyte *) buffer; + return (GLubyte *) st->renderer; default: return NULL; |