X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fglide%2Ffxglidew.c;h=1fedf2ab969d4e650cbdbb6af6b10c134c2f10c7;hb=4d17d00bfc8ad5cb331e2fca235df60d84310b32;hp=e20949e062e51bd67f94f464da170ef0b97a2747;hpb=fd83bc2b33f34195f05300eee6ebfe18570177a0;p=mesa.git

diff --git a/src/mesa/drivers/glide/fxglidew.c b/src/mesa/drivers/glide/fxglidew.c
index e20949e062e..1fedf2ab969 100644
--- a/src/mesa/drivers/glide/fxglidew.c
+++ b/src/mesa/drivers/glide/fxglidew.c
@@ -1,5 +1,3 @@
-/* $Id: fxglidew.c,v 1.23 2003/10/13 11:14:58 dborca Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  4.0
@@ -57,7 +55,7 @@ FX_grGetInteger_NoLock(FxU32 pname)
  }
 
  if (TDFX_DEBUG & VERBOSE_DRIVER) {
-    fprintf(stderr, "%s: wrong parameter (%lx)\n", __FUNCTION__, pname);
+    fprintf(stderr, "FX_grGetInteger_NoLock: wrong parameter (%lx)\n", pname);
  }
  return -1;
 }
@@ -128,7 +126,12 @@ FX_setupGrVertexLayout(void)
 
    grCoordinateSpace(GR_WINDOW_COORDS);
    grVertexLayout(GR_PARAM_XY, GR_VERTEX_X_OFFSET << 2, GR_PARAM_ENABLE);
+#if FX_PACKEDCOLOR
    grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_PARGB_OFFSET << 2, GR_PARAM_ENABLE);
+#else  /* !FX_PACKEDCOLOR */
+   grVertexLayout(GR_PARAM_RGB, GR_VERTEX_RGB_OFFSET << 2, GR_PARAM_ENABLE);
+   grVertexLayout(GR_PARAM_A, GR_VERTEX_A_OFFSET << 2, GR_PARAM_ENABLE);
+#endif /* !FX_PACKEDCOLOR */
    grVertexLayout(GR_PARAM_Q, GR_VERTEX_OOW_OFFSET << 2, GR_PARAM_ENABLE);
    grVertexLayout(GR_PARAM_Z, GR_VERTEX_OOZ_OFFSET << 2, GR_PARAM_ENABLE);
    grVertexLayout(GR_PARAM_ST0, GR_VERTEX_SOW_TMU0_OFFSET << 2,
@@ -196,7 +199,11 @@ FX_grSstQueryHardware(GrHwConfiguration * config)
       grSstSelect(i);
 
       extension = grGetString(GR_HARDWARE);
-      if (strstr(extension, "Voodoo Banshee")) {
+      if (strstr(extension, "Rush")) {
+         config->SSTs[i].type = GR_SSTTYPE_SST96;
+      } else if (strstr(extension, "Voodoo2")) {
+         config->SSTs[i].type = GR_SSTTYPE_Voodoo2;
+      } else if (strstr(extension, "Voodoo Banshee")) {
          config->SSTs[i].type = GR_SSTTYPE_Banshee;
       } else if (strstr(extension, "Voodoo3")) {
          config->SSTs[i].type = GR_SSTTYPE_Voodoo3;
@@ -204,12 +211,11 @@ FX_grSstQueryHardware(GrHwConfiguration * config)
          config->SSTs[i].type = GR_SSTTYPE_Voodoo4;
       } else if (strstr(extension, "Voodoo5")) {
          config->SSTs[i].type = GR_SSTTYPE_Voodoo5;
-      } else { /* Voodoo1,2,rush */
-         /* ZZZ TO DO: Need to distinguish whether we have V1 or V2 or Rush. */
+      } else {
          config->SSTs[i].type = GR_SSTTYPE_VOODOO;
       }
 
-      grGet(GR_MEMORY_FB, 4, &result); /* ZZZ: differs after grSstWinOpen */
+      grGet(GR_MEMORY_FB, 4, &result);
       config->SSTs[i].fbRam = result / (1024 * 1024);
 
       grGet(GR_NUM_TMU, 4, &result);
@@ -219,18 +225,19 @@ FX_grSstQueryHardware(GrHwConfiguration * config)
       config->SSTs[i].fbiRev = result;
 
       for (j = 0; j < config->SSTs[i].nTexelfx; j++) {
-	 grGet(GR_MEMORY_TMU, 4, &result); /* ZZZ: differs after grSstWinOpen */
+	 grGet(GR_MEMORY_TMU, 4, &result);
 	 config->SSTs[i].tmuConfig[j].tmuRam = result / (1024 * 1024);
 	 grGet(GR_REVISION_TMU, 4, &result);
 	 config->SSTs[i].tmuConfig[j].tmuRev = result;
       }
 
       extension = grGetString(GR_EXTENSION);
+      config->SSTs[i].HavePalExt = (strstr(extension, " PALETTE6666 ") != NULL);
       config->SSTs[i].HavePixExt = (strstr(extension, " PIXEXT ") != NULL);
       config->SSTs[i].HaveTexFmt = (strstr(extension, " TEXFMT ") != NULL);
       config->SSTs[i].HaveCmbExt = (strstr(extension, " COMBINE ") != NULL);
       config->SSTs[i].HaveMirExt = (strstr(extension, " TEXMIRROR ") != NULL);
-      config->SSTs[i].HaveTexus2 = GL_FALSE;
+      config->SSTs[i].HaveTexUma = (strstr(extension, " TEXUMA ") != NULL);
 
       /* number of Voodoo chips */
       grGet(GR_NUM_FB, 4, (void *) &numFB);
@@ -238,7 +245,7 @@ FX_grSstQueryHardware(GrHwConfiguration * config)
 
    }
 
-   tdfx_hook_glide(&config->Glide);
+   tdfx_hook_glide(&config->Glide, getenv("MESA_FX_POINTCAST") != NULL);
 
    END_BOARD_LOCK();
    return 1;