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()
This commit is contained in:
Brian Paul
2009-02-11 13:52:17 -07:00
parent c5bae14245
commit 2218592d47
5 changed files with 8 additions and 17 deletions
-7
View File
@@ -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();
-8
View File
@@ -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();
}
-2
View File
@@ -36,6 +36,4 @@
#ifndef _MESA_MATH_H_
#define _MESA_MATH_H_
extern void _math_init( void );
#endif
+5
View File
@@ -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;
}
+3
View File
@@ -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;
}