mesa: rename common_x86_macros.h -> x86_xform.h

diff --git a/src/mesa/x86-64/x86-64.c b/src/mesa/x86-64/x86-64.c
index 96f8da87f050775e4005b8a8ee0d6aa084b2e88f..ac176ef328edeb64c5c4ffc69956e24286863b33 100644 (file)
--- a/src/mesa/x86-64/x86-64.c
+++ b/src/mesa/x86-64/x86-64.c
@@ -35,7 +35,7 @@
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
 #include "x86-64.h"
-#include "../x86/common_x86_macros.h"
+#include "../x86/x86_xform.h"
 
 #ifdef DEBUG
 #include "math/m_debug.h"

diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index c037a6176187e9a21bab9f161345b53c98823ac0..de2fb1e2aadb349ed14270777dd53469a0d4cc18 100644 (file)
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -34,7 +34,7 @@
 #include "tnl/t_context.h"
 
 #include "3dnow.h"
-#include "common_x86_macros.h"
+#include "x86_xform.h"
 
 #ifdef DEBUG_MATH
 #include "math/m_debug.h"

diff --git a/src/mesa/x86/common_x86_macros.h b/src/mesa/x86/common_x86_macros.h
deleted file mode 100644 (file)
index 462f32b..0000000
--- a/src/mesa/x86/common_x86_macros.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Gareth Hughes
- */
-
-#ifndef __COMMON_X86_MACROS_H__
-#define __COMMON_X86_MACROS_H__
-
-
-/* =============================================================
- * Transformation function declarations:
- */
-
-#define XFORM_ARGS     GLvector4f *to_vec,                             \
-                       const GLfloat m[16],                            \
-                       const GLvector4f *from_vec
-
-#define DECLARE_XFORM_GROUP( pfx, sz ) \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );                \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );       \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );      \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );    \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );             \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );      \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
-
-#define ASSIGN_XFORM_GROUP( pfx, sz )                                  \
-   _mesa_transform_tab[sz][MATRIX_GENERAL] =                           \
-      _mesa_##pfx##_transform_points##sz##_general;                    \
-   _mesa_transform_tab[sz][MATRIX_IDENTITY] =                          \
-      _mesa_##pfx##_transform_points##sz##_identity;                   \
-   _mesa_transform_tab[sz][MATRIX_3D_NO_ROT] =                         \
-      _mesa_##pfx##_transform_points##sz##_3d_no_rot;                  \
-   _mesa_transform_tab[sz][MATRIX_PERSPECTIVE] =                       \
-      _mesa_##pfx##_transform_points##sz##_perspective;                        \
-   _mesa_transform_tab[sz][MATRIX_2D] =                                        \
-      _mesa_##pfx##_transform_points##sz##_2d;                         \
-   _mesa_transform_tab[sz][MATRIX_2D_NO_ROT] =                         \
-      _mesa_##pfx##_transform_points##sz##_2d_no_rot;                  \
-   _mesa_transform_tab[sz][MATRIX_3D] =                                        \
-      _mesa_##pfx##_transform_points##sz##_3d;
-
-
-/* =============================================================
- * Normal transformation function declarations:
- */
-
-#define NORM_ARGS      const GLmatrix *mat,                            \
-                       GLfloat scale,                                  \
-                       const GLvector4f *in,                           \
-                       const GLfloat *lengths,                         \
-                       GLvector4f *dest
-
-#define DECLARE_NORM_GROUP( pfx ) \
-extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );                                \
-extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );                      \
-extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );                      \
-extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );               \
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );              \
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );       \
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );            \
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
-
-#define ASSIGN_NORM_GROUP( pfx )                                       \
-   _mesa_normal_tab[NORM_RESCALE] =                                    \
-      _mesa_##pfx##_rescale_normals;                                   \
-   _mesa_normal_tab[NORM_NORMALIZE] =                                  \
-      _mesa_##pfx##_normalize_normals;                                 \
-   _mesa_normal_tab[NORM_TRANSFORM] =                                  \
-      _mesa_##pfx##_transform_normals;                                 \
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =                           \
-      _mesa_##pfx##_transform_normals_no_rot;                          \
-   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =                   \
-      _mesa_##pfx##_transform_rescale_normals;                         \
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =            \
-      _mesa_##pfx##_transform_rescale_normals_no_rot;                  \
-   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =                 \
-      _mesa_##pfx##_transform_normalize_normals;                       \
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =          \
-      _mesa_##pfx##_transform_normalize_normals_no_rot;
-
-
-#endif

diff --git a/src/mesa/x86/sse.c b/src/mesa/x86/sse.c
index 1c185387c6406fb56d124bfa67c2d0b9e26e1b9f..aef15b53152978d324f2d5f285ae191c5c3e32cf 100644 (file)
--- a/src/mesa/x86/sse.c
+++ b/src/mesa/x86/sse.c
@@ -33,7 +33,7 @@
 #include "tnl/t_context.h"
 
 #include "sse.h"
-#include "common_x86_macros.h"
+#include "x86_xform.h"
 
 #ifdef DEBUG_MATH
 #include "math/m_debug.h"

diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c
index c2df5e31e6e82bbaaf5502163b522a90d9287a64..b2f54b2ce67b45c0aced860fbe3efcd5c09ac1ea 100644 (file)
--- a/src/mesa/x86/x86_xform.c
+++ b/src/mesa/x86/x86_xform.c
@@ -33,7 +33,7 @@
 #include "tnl/t_context.h"
 
 #include "x86.h"
-#include "common_x86_macros.h"
+#include "x86_xform.h"
 #include "common_x86_asm.h"
 
 #ifdef DEBUG_MATH

diff --git a/src/mesa/x86/x86_xform.h b/src/mesa/x86/x86_xform.h
new file mode 100644 (file)
index 0000000..e886d9a
--- /dev/null
+++ b/src/mesa/x86/x86_xform.h
@@ -0,0 +1,106 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#ifndef X86_XFORM_H
+#define X86_XFORM_H
+
+
+/* =============================================================
+ * Transformation function declarations:
+ */
+
+#define XFORM_ARGS     GLvector4f *to_vec,                             \
+                       const GLfloat m[16],                            \
+                       const GLvector4f *from_vec
+
+#define DECLARE_XFORM_GROUP( pfx, sz ) \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );                \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );       \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );      \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );    \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );             \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );      \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
+
+#define ASSIGN_XFORM_GROUP( pfx, sz )                                  \
+   _mesa_transform_tab[sz][MATRIX_GENERAL] =                           \
+      _mesa_##pfx##_transform_points##sz##_general;                    \
+   _mesa_transform_tab[sz][MATRIX_IDENTITY] =                          \
+      _mesa_##pfx##_transform_points##sz##_identity;                   \
+   _mesa_transform_tab[sz][MATRIX_3D_NO_ROT] =                         \
+      _mesa_##pfx##_transform_points##sz##_3d_no_rot;                  \
+   _mesa_transform_tab[sz][MATRIX_PERSPECTIVE] =                       \
+      _mesa_##pfx##_transform_points##sz##_perspective;                        \
+   _mesa_transform_tab[sz][MATRIX_2D] =                                        \
+      _mesa_##pfx##_transform_points##sz##_2d;                         \
+   _mesa_transform_tab[sz][MATRIX_2D_NO_ROT] =                         \
+      _mesa_##pfx##_transform_points##sz##_2d_no_rot;                  \
+   _mesa_transform_tab[sz][MATRIX_3D] =                                        \
+      _mesa_##pfx##_transform_points##sz##_3d;
+
+
+/* =============================================================
+ * Normal transformation function declarations:
+ */
+
+#define NORM_ARGS      const GLmatrix *mat,                            \
+                       GLfloat scale,                                  \
+                       const GLvector4f *in,                           \
+                       const GLfloat *lengths,                         \
+                       GLvector4f *dest
+
+#define DECLARE_NORM_GROUP( pfx ) \
+extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );                                \
+extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );                      \
+extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );                      \
+extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );               \
+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );              \
+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );       \
+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );            \
+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
+
+#define ASSIGN_NORM_GROUP( pfx )                                       \
+   _mesa_normal_tab[NORM_RESCALE] =                                    \
+      _mesa_##pfx##_rescale_normals;                                   \
+   _mesa_normal_tab[NORM_NORMALIZE] =                                  \
+      _mesa_##pfx##_normalize_normals;                                 \
+   _mesa_normal_tab[NORM_TRANSFORM] =                                  \
+      _mesa_##pfx##_transform_normals;                                 \
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =                           \
+      _mesa_##pfx##_transform_normals_no_rot;                          \
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =                   \
+      _mesa_##pfx##_transform_rescale_normals;                         \
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =            \
+      _mesa_##pfx##_transform_rescale_normals_no_rot;                  \
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =                 \
+      _mesa_##pfx##_transform_normalize_normals;                       \
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =          \
+      _mesa_##pfx##_transform_normalize_normals_no_rot;
+
+
+#endif