mesa: remove _NORMAPI, _NORMAPIP macros

Was only used in one place.  Use equivalent _XFORMAPIP there instead.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index c2e3b390ebf1b1ebb0a6b8e8badef4fb3f40d9fa..a0d2a293d8afd1bbe5fd1481d3a4439e652785b6 100644 (file)
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -170,13 +170,6 @@ static inline GLuint CPU_TO_LE32(GLuint x)
 #endif
 #endif
 
-#ifdef USE_X86_ASM
-#define _NORMAPI _ASMAPI
-#define _NORMAPIP _ASMAPIP
-#else
-#define _NORMAPI
-#define _NORMAPIP *
-#endif
 
 /**
  * LONGSTRING macro

diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index e4588032298bd6da499d5f1156c4e9c75ffdea55..2ed62e7115f3a5bc9ba3f19843d1dc4d4b06aef6 100644 (file)
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -119,7 +119,7 @@ typedef void (*vec_copy_func)( GLvector4f *to,
 /*
  * Functions for transformation of normals in the VB.
  */
-typedef void (_NORMAPIP normal_func)( const GLmatrix *mat,
+typedef void (_XFORMAPIP normal_func)( const GLmatrix *mat,
                                      GLfloat scale,
                                      const GLvector4f *in,
                                      const GLfloat lengths[],