From: Brian Paul <brianp@vmware.com>
Date: Thu, 26 Feb 2015 19:26:09 +0000 (-0700)
Subject: mesa: remove _NORMAPI, _NORMAPIP macros
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=977c56df09f8d6753df2618de5a25307b7e6df7d;p=mesa.git

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 c2e3b390ebf..a0d2a293d8a 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 e4588032298..2ed62e7115f 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[],