mesa: get rid of _math_init()

Only VBO uses the evaluator code so call _math_init_eval() there.

Only TNL uses the transform/translate code so call _math_init_transformation()
and _math_init_translate9) there.

This is a step toward resolving some symbol collisions between Mesa's and
gallium's x86 codegen.
Have VBO and TNL modules call _math_init_transformation()

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 39c7fa037e014ed48c69cb7150b1b8d5fe4ade58..c5b90d9cda79511950281c98b06f9742ac6d5d7d 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -151,10 +151,7 @@
 #include "shader/atifragshader.h"
 #endif
 #if _HAVE_FULL_GL
-#include "math/m_translate.h"
 #include "math/m_matrix.h"
-#include "math/m_xform.h"
-#include "math/mathmod.h"
 #endif
 
 #ifdef USE_SPARC_ASM
@@ -387,13 +384,9 @@ one_time_init( GLcontext *ctx )
 
       _mesa_init_sqrt_table();
 
-#if _HAVE_FULL_GL
-      _math_init();
-
       for (i = 0; i < 256; i++) {
          _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
       }
-#endif
 
 #ifdef USE_SPARC_ASM
       _mesa_init_sparc_glapi_relocs();

diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 901ae5b416ab4d392544609fb60e978ff2b3abc7..fdc8abd4340a50941bab43946773ce6a503597c8 100644 (file)
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -220,11 +220,3 @@ _math_init_transformation( void )
    _mesa_init_all_x86_64_transform_asm();
 #endif
 }
-
-void
-_math_init( void )
-{
-   _math_init_transformation();
-   _math_init_translate();
-   _math_init_eval();
-}

diff --git a/src/mesa/math/mathmod.h b/src/mesa/math/mathmod.h
index 6fbaaea94bc72c11fd75083d952c88a077f926e9..fb0862b5b198d7b3cbe3fbd83639d8d27fd77494 100644 (file)
--- a/src/mesa/math/mathmod.h
+++ b/src/mesa/math/mathmod.h
@@ -36,6 +36,4 @@
 #ifndef _MESA_MATH_H_
 #define _MESA_MATH_H_
 
-extern void _math_init( void );
-
 #endif

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 7bfc7b00610cb69498bbba3e7ec7b4092385186f..f0d31fdac3558196229a5380715c6eaf7beb6f32 100644 (file)
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -32,6 +32,8 @@
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/light.h"
+#include "math/m_translate.h"
+#include "math/m_xform.h"
 
 #include "tnl.h"
 #include "t_context.h"
@@ -81,6 +83,9 @@ _tnl_CreateContext( GLcontext *ctx )
    /* plug in the VBO drawing function */
    vbo_set_draw_func(ctx, _tnl_draw_prims);
 
+   _math_init_transformation();
+   _math_init_translate();
+
    return GL_TRUE;
 }
 

diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 467ab4e3e5505dc42c8e7ba540c623f8f536a687..ca8190fd059fc637b014302efc8e5f976a8dc9bb 100644 (file)
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -28,6 +28,7 @@
 #include "main/imports.h"
 #include "main/mtypes.h"
 #include "main/api_arrayelt.h"
+#include "math/m_eval.h"
 #include "vbo.h"
 #include "vbo_context.h"
 
@@ -230,6 +231,8 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
    vbo_save_init( ctx );
 #endif
 
+   _math_init_eval();
+
    return GL_TRUE;
 }