summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-03-01 01:50:20 +0000
committerBrian Paul <[email protected]>2003-03-01 01:50:20 +0000
commit27558a160a9fe91745728d7626995cd88f8fe339 (patch)
tree0b8cbbd49d418f5ef9f10d3d721c3d4e9e925c3d /src/mesa/drivers
parent4e50ab5f70582f4e362c4572b22a4c3f87c71a14 (diff)
Killed mmath.[ch]. Moved low-level functions/assembly code into imports.[ch]
Moved type conversion and interpolation macros into macros.h Updated all the files that used to include mmath.h
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dos/dmesa.c5
-rw-r--r--src/mesa/drivers/dos/internal.h2
-rw-r--r--src/mesa/drivers/glide/fxdd.c8
-rw-r--r--src/mesa/drivers/glide/fxvb.c7
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c5
-rw-r--r--src/mesa/drivers/windows/wmesa.c3
-rw-r--r--src/mesa/drivers/x11/fakeglx.c3
-rw-r--r--src/mesa/drivers/x11/xm_api.c3
-rw-r--r--src/mesa/drivers/x11/xm_line.c3
-rw-r--r--src/mesa/drivers/x11/xm_tri.c3
10 files changed, 17 insertions, 25 deletions
diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index a72973832a4..5202bbd6b17 100644
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 5.0
+ * Version: 5.1
*
- * Copyright (C) 1999 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -39,7 +39,6 @@
#include "extensions.h"
#include "macros.h"
#include "matrix.h"
-#include "mmath.h"
#include "texformat.h"
#include "texstore.h"
#include "array_cache/acache.h"
diff --git a/src/mesa/drivers/dos/internal.h b/src/mesa/drivers/dos/internal.h
index 304a7377baa..f6dc0e4b41f 100644
--- a/src/mesa/drivers/dos/internal.h
+++ b/src/mesa/drivers/dos/internal.h
@@ -34,7 +34,7 @@
#ifndef INTERNAL_H_included
#define INTERNAL_H_included
-#include "../mmath.h"
+#include "../macros.h"
/*
* general purpose defines, etc.
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index fd099e7e115..906424810ab 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1,10 +1,10 @@
-/* $Id: fxdd.c,v 1.95 2003/01/08 21:32:36 brianp Exp $ */
+/* $Id: fxdd.c,v 1.96 2003/03/01 01:50:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.0
+ * Version: 5.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -45,7 +45,7 @@
#include "fxdrv.h"
#include "enums.h"
#include "extensions.h"
-#include "mmath.h"
+#include "macros.h"
#include "texstore.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index d14e53d21d4..f807048b093 100644
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -1,10 +1,10 @@
-/* $Id: fxvb.c,v 1.16 2002/11/04 20:29:04 brianp Exp $ */
+/* $Id: fxvb.c,v 1.17 2003/03/01 01:50:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.0
+ * Version: 5.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -40,7 +40,6 @@
#include "imports.h"
#include "macros.h"
#include "colormac.h"
-#include "mmath.h"
#include "math/m_translate.h"
#include "swrast_setup/swrast_setup.h"
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 5901ae29a09..25efb7ef4ad 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,10 +1,10 @@
-/* $Id: osmesa.c,v 1.99 2003/02/25 19:25:54 brianp Exp $ */
+/* $Id: osmesa.c,v 1.100 2003/03/01 01:50:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -45,7 +45,6 @@
#include "imports.h"
#include "macros.h"
#include "matrix.h"
-#include "mmath.h"
#include "mtypes.h"
#include "texformat.h"
#include "texstore.h"
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index 4baa547f285..456050b9fc3 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.43 2003/01/30 15:47:06 kschultz Exp $ */
+/* $Id: wmesa.c,v 1.44 2003/03/01 01:50:24 brianp Exp $ */
/*
* Windows (Win32) device driver for Mesa 3.4
@@ -39,7 +39,6 @@
#include "imports.h"
#include "macros.h"
#include "matrix.h"
-#include "mmath.h"
#include "mtypes.h"
#include "texformat.h"
#include "texstore.h"
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index b9a7ce4c6d7..86a328a066c 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.79 2003/02/25 19:25:58 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.80 2003/03/01 01:50:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -49,7 +49,6 @@
#include "config.h"
#include "macros.h"
#include "imports.h"
-#include "mmath.h"
#include "mtypes.h"
#include "xfonts.h"
#include "xmesaP.h"
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index d1d2bce49d4..80db1212da1 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,4 +1,4 @@
-/* $Id: xm_api.c,v 1.53 2003/02/17 16:35:56 brianp Exp $ */
+/* $Id: xm_api.c,v 1.54 2003/03/01 01:50:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -71,7 +71,6 @@
#include "glthread.h"
#include "imports.h"
#include "matrix.h"
-#include "mmath.h"
#include "mtypes.h"
#include "macros.h"
#include "texformat.h"
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c
index 1855fad99e3..7b629f0b49e 100644
--- a/src/mesa/drivers/x11/xm_line.c
+++ b/src/mesa/drivers/x11/xm_line.c
@@ -1,4 +1,4 @@
-/* $Id: xm_line.c,v 1.22 2003/02/17 16:35:57 brianp Exp $ */
+/* $Id: xm_line.c,v 1.23 2003/03/01 01:50:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -35,7 +35,6 @@
#include "glxheader.h"
#include "depth.h"
#include "macros.h"
-#include "mmath.h"
#include "mtypes.h"
#include "xmesaP.h"
diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index d34cac53fe8..602eba41e64 100644
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1,4 +1,4 @@
-/* $Id: xm_tri.c,v 1.31 2003/02/17 16:36:01 brianp Exp $ */
+/* $Id: xm_tri.c,v 1.32 2003/03/01 01:50:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -36,7 +36,6 @@
#include "depth.h"
#include "macros.h"
#include "imports.h"
-#include "mmath.h"
#include "mtypes.h"
#include "xmesaP.h"