--- servGL/serverglx/glxmesa.c.orig	Sun Aug  1 14:13:47 1999
+++ servGL/serverglx/glxmesa.c	Mon Aug  2 09:05:36 1999
@@ -265,9 +265,19 @@
               hwInitVisuals = NULL;
 #endif
            } else 
-           if ( (!strcmp("RIVA128", vga256InfoRec.chipset)) ||
-                (!strcmp("RIVATNT", vga256InfoRec.chipset)) ||
-                (!strcmp("RIVATNT2", vga256InfoRec.chipset)) )  {
+           if ( /* XFree86 3.3.3.1 */
+                (!strcmp("RIVA128",  vga256InfoRec.chipset)) ||
+                (!strcmp("RIVATNT",  vga256InfoRec.chipset)) ||
+                (!strcmp("RIVATNT2", vga256InfoRec.chipset)) ||
+
+                /* XFree86 3.3.4 */
+                (!strcmp("RIVA 128",         vga256InfoRec.chipset)) ||
+                (!strcmp("RIVA TNT",         vga256InfoRec.chipset)) ||
+                (!strcmp("RIVA TNT2",        vga256InfoRec.chipset)) ||
+                (!strcmp("RIVA ULTRA TNT2",  vga256InfoRec.chipset)) ||
+                (!strcmp("RIVA VANTA",       vga256InfoRec.chipset)) ||
+                (!strcmp("RIVA ULTRA VANTA", vga256InfoRec.chipset)) ||
+                (!strcmp("RIVA INTEGRATED",  vga256InfoRec.chipset)) )  {
               hw_flag = GL_TRUE;
               /* XXX - may need to select correct one */ 
               glx_chipset = NV_RIVATNT; 
