small changes (version string)

diff --git a/src/mesa/drivers/glide/fx.rc b/src/mesa/drivers/glide/fx.rc
index 5d00629b826d57ba8d31f26d927188352bac6410..bace051686c696950191fd5d4947db66bf1ec285 100644 (file)
--- a/src/mesa/drivers/glide/fx.rc
+++ b/src/mesa/drivers/glide/fx.rc
@@ -1,12 +1,12 @@
 #include <windows.h>
 
-#define PRODNAME                "Mesa 5.1"
+#define PRODNAME                "Mesa 6.x"
 #define CONTACTSTR              "http://www.mesa3d.org"
-#define HWSTR                   "3dfx Voodoo^2, Voodoo Banshee, Velocity 100/200, Voodoo3, Voodoo4, Voodoo5"
+#define HWSTR                   "3dfx Voodoo Graphics, Voodoo^2, Voodoo Banshee, Velocity 100/200, Voodoo3, Voodoo4, Voodoo5"
 #define COPYRIGHTSTR            "Copyright \251 Brian E. Paul"
 
-#define VERSIONSTR              "5.1.0.1"
-#define MANVERSION              5
+#define VERSIONSTR              "6.1.0.1"
+#define MANVERSION              6
 #define MANREVISION             1
 #define BUILD_NUMBER            1
 

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 20cf7240de541d4e403b1c64ea9258d000cbdde6..0474de9016ae42225de7334cc3979b59a4f9cc58 100644 (file)
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -395,7 +395,7 @@ fxMesaCreateContext(GLuint win,
   */
  /* number of SLI units and AA Samples per chip */
  sliaa = 0;
- switch (voodoo->type) {
+ switch (fxMesa->type) {
         case GR_SSTTYPE_VOODOO:
         case GR_SSTTYPE_SST96:
         case GR_SSTTYPE_Banshee:
@@ -648,9 +648,10 @@ fxMesaCreateContext(GLuint win,
                       fxMesa->snapVertices ? "" : "no ");
    }
 
-  sprintf(fxMesa->rendererString, "Mesa %s v0.60 %s",
-                           grGetString(GR_RENDERER),
-                           grGetString(GR_HARDWARE));
+  sprintf(fxMesa->rendererString, "Mesa %s v0.61 %s%s",
+          grGetString(GR_RENDERER),
+          grGetString(GR_HARDWARE),
+          ((fxMesa->type < GR_SSTTYPE_Voodoo4) && (voodoo->numChips > 1)) ? " SLI" : "");
 
    fxMesa->glVis = _mesa_create_visual(GL_TRUE,                /* RGB mode */
                                       doubleBuffer,