Mesa (master): mesa: remove _NORMAPI, _NORMAPIP macros

Brian Paul brianp at kemper.freedesktop.org
Sat Feb 28 20:46:11 UTC 2015


Module: Mesa
Branch: master
Commit: 977c56df09f8d6753df2618de5a25307b7e6df7d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=977c56df09f8d6753df2618de5a25307b7e6df7d

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Feb 26 12:26:09 2015 -0700

mesa: remove _NORMAPI, _NORMAPIP macros

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

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

---

 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 c2e3b39..a0d2a29 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
 
 /**
  * LONGSTRING macro
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[],




More information about the mesa-commit mailing list