From 3041d05bbcccfddba01a1eeaba01e5da0e1e99af Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 2 Jan 2001 22:02:51 +0000
Subject: Removed fixed.h (GLfixed now in mtypes.h, fixed-pt macros in mmath.h)
 Clean-up of color conversion macros. New mmath.h macros (IROUND, IFLOOR,
 ICEIL, FRAC) used in various places.

---
 src/mesa/main/mtypes.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main/mtypes.h')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 61e70688b6..7992b00304 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.8 2000/12/27 22:52:45 keithw Exp $ */
+/* $Id: mtypes.h,v 1.9 2001/01/02 22:02:51 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,7 +31,6 @@
 
 #include "glheader.h"
 #include "config.h"		/* Hardwired parameters */
-#include "fixed.h"		/* GLfixed */
 #include "glapitable.h"
 #include "glthread.h"
 
@@ -101,17 +100,19 @@
 #endif
 
 
-/* Maximum number of temporary vertices required for clipping.  (Used
- * in array_cache and tnl modules).
- */
-#define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1)
-
 /*
  * Depth buffer data type:
  */
 typedef GLuint GLdepth;  /* Must be 32-bits! */
 
 
+/*
+ * Fixed point data type:
+ */
+typedef int GLfixed;
+
+
+
 /*
  * Some forward type declarations
  */
@@ -123,6 +124,12 @@ typedef struct __GLcontextRec GLcontext;
 
 
 
+/* Maximum number of temporary vertices required for clipping.  (Used
+ * in array_cache and tnl modules).
+ */
+#define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1)
+
+
 /* Data structure for color tables */
 struct gl_color_table {
    GLvoid *Table;
@@ -1386,7 +1393,6 @@ struct gl_extensions {
 
 #define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT|		\
                                             _NEW_TEXTURE)
-
 #define _IMAGE_NEW_TRANSFER_STATE        (_NEW_PIXEL|_NEW_COLOR_MATRIX)
 
 
-- 
cgit v1.2.3