summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-03-24 16:38:07 +0000
committerKeith Whitwell <keithw@vmware.com>2009-03-24 16:38:27 +0000
commita4a0ba1adb9fbe168c6b84cdd281992893208c08 (patch)
tree4e74097ed2e52577898cdc794d8b2f653c22a46b
parenteb9801ccfbd6d808e4761d66202bc368b86679b6 (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.c15
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 @@
#include "st_context.h"
#include "st_cb_strings.h"
-#define ST_VERSION_STRING "0.2"
+#define ST_VERSION_STRING "0.3"
static const GLubyte *
st_get_string(GLcontext * ctx, GLenum name)
@@ -50,18 +50,7 @@ st_get_string(GLcontext * ctx, GLenum name)
switch (name) {
case GL_VENDOR: {
const char *vendor = screen->get_vendor( screen );
- const char *tungsten = "Tungsten Graphics, Inc.";
-
- /* Tungsten Graphics, Inc. developed the state_tracker module
- * (and much of Mesa), but the driver itself may come from elsewhere.
- * The additional string allows "and XyzCorp" to reflect this.
- */
- if (vendor && strcmp(vendor, tungsten) != 0)
- util_snprintf(st->vendor, sizeof(st->vendor),
- "%s and %s", tungsten, vendor);
- else
- util_snprintf(st->vendor, sizeof(st->vendor), "%s", tungsten);
-
+ util_snprintf(st->vendor, sizeof(st->vendor), "%s", vendor);
return (GLubyte *) st->vendor;
}