check hardware type and use SETUP_SNAP if needed

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 72f2a4538b70bd8428b6d1288d30232ffad579c0..4150652099f2e9d9a72fa85866cb9db7c84d87eb 100644 (file)
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -400,9 +400,13 @@ fxMesaCreateContext(GLuint win,
    }
 
    /*
-    * Pixel tables are use during pixel read-back
+    * Pixel tables are used during pixel read-back
     * Either initialize them for RGB or BGR order.
+    * Also determine if we need vertex snapping.
     */
+
+   fxMesa->snapVertices = GL_TRUE; /* play it safe */
+
 #ifdef FXMESA_USE_ARGB
    useBGR = GL_FALSE;          /* Force RGB pixel order */
    system = "FXMESA_USE_ARGB";
@@ -432,6 +436,7 @@ fxMesaCreateContext(GLuint win,
         /* Voodoo 2 */
         useBGR = GL_TRUE;
         system = "Voodoo2";
+         fxMesa->snapVertices = GL_FALSE;
       }
       else if (voodoo->nTexelfx == 2 &&
               voodoo->fbiRev == 2 &&
@@ -457,22 +462,27 @@ fxMesaCreateContext(GLuint win,
         /* Presumed Voodoo3 */
         useBGR = GL_FALSE;
         system = "Voodoo3";
+         fxMesa->snapVertices = GL_FALSE;
       }
-      if (getenv("MESA_FX_INFO")) {
-        printf
-           ("Voodoo: Texelfx: %d / FBI Rev.: %d / TMU Rev.: %d / TMU RAM: %d\n",
-            voodoo->nTexelfx, voodoo->fbiRev, voodoo->tmuConfig[0].tmuRev,
-            voodoo->tmuConfig[0].tmuRam);
+      if (verbose) {
+        fprintf(stderr,
+           "Voodoo: Texelfx: %d / FBI Rev.: %d / TMU Rev.: %d / TMU RAM: %d\n",
+                 voodoo->nTexelfx, voodoo->fbiRev, voodoo->tmuConfig[0].tmuRev,
+                 voodoo->tmuConfig[0].tmuRam);
       }
    }
    else {
       useBGR = GL_FALSE;       /* use RGB pixel order otherwise */
       system = "non-voodoo";
+      fxMesa->snapVertices = GL_FALSE;
    }
 #endif /*FXMESA_USE_ARGB */
 
-   if (getenv("MESA_FX_INFO"))
-      printf("Voodoo pixel order: %s (%s)\n", useBGR ? "BGR" : "RGB", system);
+   if (verbose) {
+      fprintf(stderr, "Voodoo pixel order: %s (%s)\n",
+              useBGR ? "BGR" : "RGB", system);
+      fprintf(stderr, "Vertex snapping: %d\n", fxMesa->snapVertices);
+   }
 
    fxInitPixelTables(fxMesa, useBGR);
 

diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 0a9944ea88a78d17735d62b1b8d6c72228ccfb45..0d4c7a45bd29bfcdc0eccce822e7b80f2eb4cf55 100644 (file)
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -439,7 +439,7 @@ struct tfxMesaContext
    GLuint setup_gone;          /* for multipass */
    GLuint stw_hint_state;      /* for grHints */
    fxVertex *verts;
-
+   GLboolean snapVertices;      /* needed for older Voodoo hardware */
 
    /* Rasterization:
     */

diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index 90fe9f2724b269d96834a3f9e2cb018505f1d950..e38d3c3cdd5cfddf977c942e67abde1cd24fd60a 100644 (file)
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -298,10 +298,8 @@ fx_validate_BuildProjVerts(GLcontext * ctx, GLuint start, GLuint count,
    else {
       GLuint setupindex = SETUP_XYZW;
 
-#if 0
-      if (is_voodoo_graphics)
-        setupindex |= SETUP_SNAP;
-#endif
+      if (fxMesa->snapVertices)
+         setupindex |= SETUP_SNAP;
 
       fxMesa->tmu_source[0] = 0;
       fxMesa->tmu_source[1] = 1;