diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-03-24 16:38:07 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-03-24 16:38:27 +0000 |
commit | a4a0ba1adb9fbe168c6b84cdd281992893208c08 (patch) | |
tree | 4e74097ed2e52577898cdc794d8b2f653c22a46b | |
parent | eb9801ccfbd6d808e4761d66202bc368b86679b6 (diff) |
mesa/st: bump gallium version to 0.3
To distinguish from the -0.2 version still being maintained on the
gallium-mesa-7.4 branch. There are already greater interface changes
between these two branches than there were between -0.2 and -0.1.
Also stop injecting Tungsten into the vendor string - the Gallium in
the renderer string should be sufficient.
-rw-r--r-- | src/mesa/state_tracker/st_cb_strings.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c index 2036ccafbfb..bb931f17c4e 100644 --- a/src/mesa/state_tracker/st_cb_strings.c +++ b/src/mesa/state_tracker/st_cb_strings.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "st_context.h" | 39 | #include "st_context.h" |
40 | #include "st_cb_strings.h" | 40 | #include "st_cb_strings.h" |
41 | 41 | ||
42 | #define ST_VERSION_STRING "0.2" | 42 | #define ST_VERSION_STRING "0.3" |
43 | 43 | ||
44 | static const GLubyte * | 44 | static const GLubyte * |
45 | st_get_string(GLcontext * ctx, GLenum name) | 45 | st_get_string(GLcontext * ctx, GLenum name) |
@@ -50,18 +50,7 @@ st_get_string(GLcontext * ctx, GLenum name) | |||
50 | switch (name) { | 50 | switch (name) { |
51 | case GL_VENDOR: { | 51 | case GL_VENDOR: { |
52 | const char *vendor = screen->get_vendor( screen ); | 52 | const char *vendor = screen->get_vendor( screen ); |
53 | const char *tungsten = "Tungsten Graphics, Inc."; | 53 | util_snprintf(st->vendor, sizeof(st->vendor), "%s", vendor); |
54 | |||
55 | /* Tungsten Graphics, Inc. developed the state_tracker module | ||
56 | * (and much of Mesa), but the driver itself may come from elsewhere. | ||
57 | * The additional string allows "and XyzCorp" to reflect this. | ||
58 | */ | ||
59 | if (vendor && strcmp(vendor, tungsten) != 0) | ||
60 | util_snprintf(st->vendor, sizeof(st->vendor), | ||
61 | "%s and %s", tungsten, vendor); | ||
62 | else | ||
63 | util_snprintf(st->vendor, sizeof(st->vendor), "%s", tungsten); | ||
64 | |||
65 | return (GLubyte *) st->vendor; | 54 | return (GLubyte *) st->vendor; |
66 | } | 55 | } |
67 | 56 | ||