mesa: Change "BRIAN PAUL" to "THE AUTHORS" in license text.

[mesa.git] / src / mesa / math / m_xform.h

diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index 24e8ddbd57cfbb6bab37175d79fe0ebdeaa6318e..7d3611b17e21e0f0c2c763d1a69f81f302fafdfb 100644 (file)
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -17,7 +17,7 @@
  * 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
+ * THE AUTHORS 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.
  */
@@ -27,10 +27,10 @@
 #define _M_XFORM_H
 
 
+#include "main/compiler.h"
 #include "main/glheader.h"
-#include "main/config.h"
-#include "math/m_vector.h"
 #include "math/m_matrix.h"
+#include "math/m_vector.h"
 
 #ifdef USE_X86_ASM
 #define _XFORMAPI _ASMAPI
@@ -41,13 +41,10 @@
 #endif
 
 
-extern void
-_mesa_transform_vector(GLfloat u[4], CONST GLfloat v[4], CONST GLfloat m[16]);
-
-
 extern void
 _math_init_transformation(void);
-
+extern void
+init_c_cliptest(void);
 
 /* KW: Clip functions now do projective divide as well.  The projected
  * coordinates are very useful to us because they let us cull
@@ -106,25 +103,26 @@ typedef GLvector4f * (_XFORMAPIP clip_func)( GLvector4f *vClip,
                                             GLvector4f *vProj,
                                             GLubyte clipMask[],
                                             GLubyte *orMask,
-                                            GLubyte *andMask );
+                                            GLubyte *andMask,
+                                            GLboolean viewport_z_clip );
 
 typedef void (*dotprod_func)( GLfloat *out,
                              GLuint out_stride,
-                             CONST GLvector4f *coord_vec,
-                             CONST GLfloat plane[4] );
+                             const GLvector4f *coord_vec,
+                             const GLfloat plane[4] );
 
 typedef void (*vec_copy_func)( GLvector4f *to,
-                              CONST GLvector4f *from );
+                              const GLvector4f *from );
 
 
 
 /*
  * Functions for transformation of normals in the VB.
  */
-typedef void (_NORMAPIP normal_func)( CONST GLmatrix *mat,
+typedef void (_NORMAPIP normal_func)( const GLmatrix *mat,
                                      GLfloat scale,
-                                     CONST GLvector4f *in,
-                                     CONST GLfloat lengths[],
+                                     const GLvector4f *in,
+                                     const GLfloat lengths[],
                                      GLvector4f *dest );
 
 
@@ -144,20 +142,8 @@ typedef void (_NORMAPIP normal_func)( CONST GLmatrix *mat,
  *     parameter, to allow a unified interface.
  */
 typedef void (_XFORMAPIP transform_func)( GLvector4f *to_vec,
-                                         CONST GLfloat m[16],
-                                         CONST GLvector4f *from_vec );
-
-
-extern GLvector4f *_mesa_project_points( GLvector4f *to,
-                                        CONST GLvector4f *from );
-
-extern void _mesa_transform_bounds3( GLubyte *orMask, GLubyte *andMask,
-                                    CONST GLfloat m[16],
-                                    CONST GLfloat src[][3] );
-
-extern void _mesa_transform_bounds2( GLubyte *orMask, GLubyte *andMask,
-                                    CONST GLfloat m[16],
-                                    CONST GLfloat src[][3] );
+                                         const GLfloat m[16],
+                                         const GLvector4f *from_vec );
 
 
 extern dotprod_func  _mesa_dotprod_tab[5];
@@ -173,9 +159,6 @@ extern normal_func   _mesa_normal_tab[0xf];
 extern transform_func *_mesa_transform_tab[5];
 
 
-extern void _mesa_transform_point_sz( GLfloat Q[4], CONST GLfloat M[16],
-                                     CONST GLfloat P[4], GLuint sz );
-
 
 #define TransformRaw( to, mat, from ) \
    ( _mesa_transform_tab[(from)->size][(mat)->type]( to, (mat)->m, from ), \