X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fcensus%2F3dgfx.h;h=19127a8be95de6cf5097f92624ff47afc4d20a50;hp=89b28d80d6192c76d8e0cd60f6fd88ea69d6cd54;hb=0a37e241149d011e038aceb3faac568b405f8ecd;hpb=10843571c724084c68d33d0438167d400cc8de2e

diff --git a/src/census/3dgfx.h b/src/census/3dgfx.h
index 89b28d8..19127a8 100644
--- a/src/census/3dgfx.h
+++ b/src/census/3dgfx.h
@@ -2,6 +2,24 @@
 #define THREEDGFX_H_
 
 #include "inttypes.h"
+#include "gfxutil.h"
+
+#define G3D_PIXFMT32
+typedef uint32_t g3d_pixel;
+
+#ifdef G3D_PIXFMT16
+#define G3D_PACK_RGB(r, g, b)	PACK_RGB16(r, g, b)
+#define G3D_UNPACK_R(c)			UNPACK_R16(c)
+#define G3D_UNPACK_G(c)			UNPACK_G16(c)
+#define G3D_UNPACK_B(c)			UNPACK_B16(c)
+#endif
+#ifdef G3D_PIXFMT32
+#define G3D_PACK_RGB(r, g, b)	PACK_RGB32(r, g, b)
+#define G3D_UNPACK_R(c)			UNPACK_R32(c)
+#define G3D_UNPACK_G(c)			UNPACK_G32(c)
+#define G3D_UNPACK_B(c)			UNPACK_B32(c)
+#endif
+
 
 struct g3d_vertex {
 	float x, y, z, w;
@@ -26,7 +44,7 @@ enum {
 	G3D_LIGHT1		= 0x000010,
 	G3D_LIGHT2		= 0x000020,
 	G3D_LIGHT3		= 0x000040,
-	G3D_TEXTURE_2D	= 0x000080,	/* XXX doesn't affect anything, use g3d_polygon_mode */
+	G3D_TEXTURE_2D	= 0x000080,
 	G3D_BLEND		= 0x000100,
 	G3D_TEXTURE_GEN	= 0x000200,
 	G3D_CLIP_FRUSTUM = 0x000800,/* when disabled, don't clip against the frustum */