[Mesa-dev] [PATCH 3/7] mesa: remove _NORMAPI, _NORMAPIP macros

Brian Paul brianp at vmware.com
Fri Feb 27 16:47:51 PST 2015


Was only used in one place.  Use equivalent _XFORMAPIP there instead.
---
 src/mesa/main/compiler.h | 7 -------
 src/mesa/math/m_xform.h  | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index cb1ea46..9d7df05 100644
--- 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
 
 
 /*
diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index e458803..2ed62e7 100644
--- 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[],
-- 
1.9.1



More information about the mesa-dev mailing list