Changeset 3598 for trunk/src/opengl/mesa/3dfx/fxtrifuncs.c

Timestamp:

May 23, 2000, 10:41:28 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/3dfx/fxtrifuncs.c (modified) (11 diffs)

trunk/src/opengl/mesa/3dfx/fxtrifuncs.c

@@ -3 +3 @@
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
@@ -58 +58 @@
 
 
-/* Is this enough?  Do we need more triangle funcs?  
+/* Is this enough?  Do we need more triangle funcs?
  */
 static triangle_func tri_tab[0x40];  /* only 0x20 actually used */
@@ -129 +129 @@
 #include "fxtritmp.h"
 
+/* We don't actually do antialiasing correctly. Geometry has to be
+   sorted for glide's antialiasing to operate */
+#if 0
 #define IND (FX_ANTIALIAS)
 #define TAG(x) x##_aa
@@ -192 +195 @@
 #define TAG(x) x##_aa_flat_front_back_twoside_offset
 #include "fxtritmp.h"
-
-
-void fxDDTrifuncInit() 
+#endif
+
+void fxDDTrifuncInit()
 {
    init();
@@ -212 +215 @@
    init_flat_front_back_twoside();
    init_flat_front_back_twoside_offset();
+#if 0
    init_aa();
    init_aa_offset();
@@ -228 +232 @@
    init_aa_flat_front_back_twoside();
    init_aa_flat_front_back_twoside_offset();
+#endif
 }
 
@@ -233 +238 @@
 {
    fprintf(stderr, "%s: (%x) %s%s%s%s%s%s\n",
-           msg, state,
-           (state & FX_ANTIALIAS)  ? "antialias, "  : "",
-           (state & FX_FLAT)       ? "flat, "       : "",
-           (state & FX_TWOSIDE)    ? "twoside, "    : "",
-           (state & FX_OFFSET)     ? "offset, "     : "",
-           (state & FX_FRONT_BACK) ? "front-back, " : "",
-           (state & FX_FALLBACK)    ? "fallback"     : "");
+           msg, state,
+           (state & FX_ANTIALIAS)  ? "antialias, "  : "",
+           (state & FX_FLAT)       ? "flat, "       : "",
+           (state & FX_TWOSIDE)    ? "twoside, "    : "",
+           (state & FX_OFFSET)     ? "offset, "     : "",
+           (state & FX_FRONT_BACK) ? "front-back, " : "",
+           (state & FX_FALLBACK)    ? "fallback"     : "");
 }
 
@@ -246 +251 @@
 {
    fprintf(stderr, "%s: (%x) %s %s%s %s%s\n",
-           msg, state,
-           (state & GR_STWHINT_W_DIFF_FBI)    ? "w-fbi, "   : "",
-           (state & GR_STWHINT_W_DIFF_TMU0)   ? "w-tmu0, "  : "",
-           (state & GR_STWHINT_ST_DIFF_TMU0)  ? "st-tmu0, " : "",
-           (state & GR_STWHINT_W_DIFF_TMU1)   ? "w-tmu1, "  : "",
-           (state & GR_STWHINT_ST_DIFF_TMU1)  ? "st-tmu1, " : "");
+           msg, state,
+           (state & GR_STWHINT_W_DIFF_FBI)    ? "w-fbi, "   : "",
+           (state & GR_STWHINT_W_DIFF_TMU0)   ? "w-tmu0, "  : "",
+           (state & GR_STWHINT_ST_DIFF_TMU0)  ? "st-tmu0, " : "",
+           (state & GR_STWHINT_W_DIFF_TMU1)   ? "w-tmu1, "  : "",
+           (state & GR_STWHINT_ST_DIFF_TMU1)  ? "st-tmu1, " : "");
 
 }
@@ -265 +270 @@
 
    if (flags) {
-      if (fxMesa->render_index & FX_OFFSET) 
-         FX_grDepthBiasLevel(0);
+      if (fxMesa->render_index & FX_OFFSET)
+         FX_grDepthBiasLevel(0);
 
       if (flags & (DD_SELECT|DD_FEEDBACK)) {
-         fxMesa->PointsFunc = 0;
-         fxMesa->LineFunc = 0;
-         fxMesa->TriangleFunc = 0;
-         fxMesa->QuadFunc = 0;
-         fxMesa->render_index = FX_FALLBACK;            
-         ctx->IndirectTriangles |= DD_SW_RASTERIZE;
-         return;
+         fxMesa->PointsFunc = 0;
+         fxMesa->LineFunc = 0;
+         fxMesa->TriangleFunc = 0;
+         fxMesa->QuadFunc = 0;
+         fxMesa->render_index = FX_FALLBACK;
+         ctx->IndirectTriangles |= DD_SW_RASTERIZE;
+#if 0
+         fprintf(stderr, "Fallback select|feeback\n");
+#endif
+         return;
       }
-   
+
       if (flags & DD_FLATSHADE)                    ind |= FX_FLAT;
       if (flags & DD_TRI_LIGHT_TWOSIDE)            ind |= FX_TWOSIDE;
       if (flags & DD_MULTIDRAW)                    ind |= FX_FRONT_BACK;
-      if (flags & DD_POINT_SMOOTH)                 ind |= FX_ANTIALIAS;
-      if (flags & (DD_POINT_SIZE|DD_POINT_ATTEN))  ind |= FX_FALLBACK;
+      if (flags & (DD_POINT_ATTEN|DD_POINT_SMOOTH))  {
+        ind |= FX_FALLBACK;
+#if 0
+        if (flags&DD_POINT_ATTEN)
+          fprintf(stderr, "Fallback point atten\n");
+        if (flags&DD_POINT_SMOOTH)
+          fprintf(stderr, "Fallback point smooth\n");
+#endif
+      }
 
       fxMesa->render_index = ind;
       fxMesa->PointsFunc = points_tab[ind];
       if (ind&FX_FALLBACK)
-         ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
+         ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
       ind &= ~(FX_ANTIALIAS|FX_FALLBACK);
 
-      if (flags & DD_LINE_SMOOTH)                   ind |= FX_ANTIALIAS;
-      if (flags & (DD_LINE_WIDTH|DD_LINE_STIPPLE))  ind |= FX_FALLBACK;
+      if (flags & (DD_LINE_STIPPLE|DD_LINE_SMOOTH))  {
+        ind |= FX_FALLBACK;
+#if 0
+        if (flags&DD_LINE_STIPPLE)
+          fprintf(stderr, "Fallback line stipple\n");
+        if (flags&DD_LINE_SMOOTH)
+          fprintf(stderr, "Fallback line smooth\n");
+#endif
+      }
 
       fxMesa->render_index |= ind;
       fxMesa->LineFunc = line_tab[ind];
       if (ind&FX_FALLBACK)
-         ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
+         ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
       ind &= ~(FX_ANTIALIAS|FX_FALLBACK);
 
-      if (flags & DD_TRI_SMOOTH)                    ind |= FX_ANTIALIAS;
       if (flags & DD_TRI_OFFSET)                    ind |= FX_OFFSET;
-      if (flags & (DD_TRI_UNFILLED|DD_TRI_STIPPLE)) ind |= FX_FALLBACK; 
+      if (flags & (DD_TRI_UNFILLED|DD_TRI_STIPPLE|DD_TRI_SMOOTH)) {
+        ind |= FX_FALLBACK;
+#if 0
+        if (flags&DD_TRI_UNFILLED)
+          fprintf(stderr, "Fallback tri unfilled\n");
+        if (flags&DD_TRI_STIPPLE)
+          fprintf(stderr, "Fallback tri stippled\n");
+        if (flags&DD_TRI_SMOOTH)
+          fprintf(stderr, "Fallback tri smooth\n");
+#endif
+      }
 
       fxMesa->render_index |= ind;
@@ -308 +339 @@
 
       if (ind&FX_FALLBACK)
-         ctx->IndirectTriangles |= DD_TRI_SW_RASTERIZE | DD_QUAD_SW_RASTERIZE;
-   } 
+         ctx->IndirectTriangles |= DD_TRI_SW_RASTERIZE | DD_QUAD_SW_RASTERIZE;
+   }
    else if (fxMesa->render_index)
    {
-      if (fxMesa->render_index & FX_OFFSET) 
-         FX_grDepthBiasLevel(0);
+      if (fxMesa->render_index & FX_OFFSET)
+         FX_grDepthBiasLevel(0);
 
       fxMesa->render_index = 0;
@@ -333 +364 @@
  */
 
+extern int gl_fx_dummy_function_tris(void);
 int gl_fx_dummy_function_tris(void)
 {