X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2F3dgfx%2Fpolyfill.c;h=a6eb19ff4d5fcac9e61f63231be576ce662e376a;hp=972c2187b8da93eefd832d87aa5da071f000754a;hb=659ca11730af4e7e5b1b350efa4198a9c42de287;hpb=2e6bc96b25ae3ad5be7f04934be01f63dfd23ce2

diff --git a/src/3dgfx/polyfill.c b/src/3dgfx/polyfill.c
index 972c218..a6eb19f 100644
--- a/src/3dgfx/polyfill.c
+++ b/src/3dgfx/polyfill.c
@@ -15,6 +15,7 @@
 /* mode bits: 00-wire 01-flat 10-gouraud 11-reserved
  *     bit 2: texture
  *     bit 3-4: blend mode: 00-none 01-alpha 10-additive 11-reserved
+ *     bit 5: zbuffering
  */
 void (*fillfunc[])(struct pvertex*, int) = {
 	polyfill_wire,
@@ -40,10 +41,35 @@ void (*fillfunc[])(struct pvertex*, int) = {
 	polyfill_add_tex_wire,
 	polyfill_add_tex_flat,
 	polyfill_add_tex_gouraud,
+	0, 0, 0, 0, 0, 0, 0, 0, 0,
+	polyfill_wire,
+	polyfill_flat_zbuf,
+	polyfill_gouraud_zbuf,
+	0,
+	polyfill_tex_wire,
+	polyfill_tex_flat_zbuf,
+	polyfill_tex_gouraud_zbuf,
+	0,
+	polyfill_alpha_wire,
+	polyfill_alpha_flat_zbuf,
+	polyfill_alpha_gouraud_zbuf,
+	0,
+	polyfill_alpha_tex_wire,
+	polyfill_alpha_tex_flat_zbuf,
+	polyfill_alpha_tex_gouraud_zbuf,
+	0,
+	polyfill_add_wire,
+	polyfill_add_flat_zbuf,
+	polyfill_add_gouraud_zbuf,
+	0,
+	polyfill_add_tex_wire,
+	polyfill_add_tex_flat_zbuf,
+	polyfill_add_tex_gouraud_zbuf,
 	0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 struct pimage pfill_fb, pfill_tex;
+uint16_t *pfill_zbuf;
 
 #define EDGEPAD	8
 static struct pvertex *edgebuf, *left, *right;
@@ -171,6 +197,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #undef TEXMAP
 #undef BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -181,6 +208,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #undef TEXMAP
 #undef BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -191,6 +219,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #define TEXMAP
 #undef BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -201,6 +230,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #define TEXMAP
 #undef BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -211,6 +241,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #undef TEXMAP
 #define BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -221,6 +252,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #undef TEXMAP
 #define BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -231,6 +263,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #define TEXMAP
 #define BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -241,6 +274,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #define TEXMAP
 #define BLEND_ALPHA
 #undef BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -251,6 +285,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #undef TEXMAP
 #undef BLEND_ALPHA
 #define BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -261,6 +296,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #undef TEXMAP
 #undef BLEND_ALPHA
 #define BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -271,6 +307,7 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #define TEXMAP
 #undef BLEND_ALPHA
 #define BLEND_ADD
+#undef ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE
@@ -281,6 +318,141 @@ void polyfill_add_tex_wire(struct pvertex *verts, int nverts)
 #define TEXMAP
 #undef BLEND_ALPHA
 #define BLEND_ADD
+#undef ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+/* ---- zbuffer variants ----- */
+
+#define POLYFILL polyfill_flat_zbuf
+#define SCANEDGE scanedge_flat_zbuf
+#undef GOURAUD
+#undef TEXMAP
+#undef BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_gouraud_zbuf
+#define SCANEDGE scanedge_gouraud_zbuf
+#define GOURAUD
+#undef TEXMAP
+#undef BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_tex_flat_zbuf
+#define SCANEDGE scanedge_tex_flat_zbuf
+#undef GOURAUD
+#define TEXMAP
+#undef BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_tex_gouraud_zbuf
+#define SCANEDGE scanedge_tex_gouraud_zbuf
+#define GOURAUD
+#define TEXMAP
+#undef BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_alpha_flat_zbuf
+#define SCANEDGE scanedge_alpha_flat_zbuf
+#undef GOURAUD
+#undef TEXMAP
+#define BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_alpha_gouraud_zbuf
+#define SCANEDGE scanedge_alpha_gouraud_zbuf
+#define GOURAUD
+#undef TEXMAP
+#define BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_alpha_tex_flat_zbuf
+#define SCANEDGE scanedge_alpha_tex_flat_zbuf
+#undef GOURAUD
+#define TEXMAP
+#define BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_alpha_tex_gouraud_zbuf
+#define SCANEDGE scanedge_alpha_tex_gouraud_zbuf
+#define GOURAUD
+#define TEXMAP
+#define BLEND_ALPHA
+#undef BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_add_flat_zbuf
+#define SCANEDGE scanedge_add_flat_zbuf
+#undef GOURAUD
+#undef TEXMAP
+#undef BLEND_ALPHA
+#define BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_add_gouraud_zbuf
+#define SCANEDGE scanedge_add_gouraud_zbuf
+#define GOURAUD
+#undef TEXMAP
+#undef BLEND_ALPHA
+#define BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_add_tex_flat_zbuf
+#define SCANEDGE scanedge_add_tex_flat_zbuf
+#undef GOURAUD
+#define TEXMAP
+#undef BLEND_ALPHA
+#define BLEND_ADD
+#define ZBUF
+#include "polytmpl.h"
+#undef POLYFILL
+#undef SCANEDGE
+
+#define POLYFILL polyfill_add_tex_gouraud_zbuf
+#define SCANEDGE scanedge_add_tex_gouraud_zbuf
+#define GOURAUD
+#define TEXMAP
+#undef BLEND_ALPHA
+#define BLEND_ADD
+#define ZBUF
 #include "polytmpl.h"
 #undef POLYFILL
 #undef SCANEDGE