From aa2069586d434dd0487b0daa2b583efe801a0d51 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 16 Sep 2005 18:14:24 +0000 Subject: use mesa import wrappers, bug 4468 --- src/mesa/tnl/t_context.c | 2 +- src/mesa/tnl/t_vb_arbprogram.c | 2 +- src/mesa/tnl/t_vb_arbprogram_sse.c | 2 +- src/mesa/tnl/t_vertex_sse.c | 2 +- src/mesa/tnl/t_vp_build.c | 2 +- src/mesa/tnl/t_vtx_api.c | 2 +- src/mesa/tnl/t_vtx_x86.c | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mesa/tnl') diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 472b97bfe5..cda4cf2cbd 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -73,7 +73,7 @@ _tnl_CreateContext( GLcontext *ctx ) return GL_FALSE; } - if (getenv("MESA_CODEGEN")) + if (_mesa_getenv("MESA_CODEGEN")) tnl->AllowCodegen = GL_TRUE; /* Initialize the VB. diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c index 5cee3d78dc..9fc49a2cee 100644 --- a/src/mesa/tnl/t_vb_arbprogram.c +++ b/src/mesa/tnl/t_vb_arbprogram.c @@ -1031,7 +1031,7 @@ static void compile_vertex_program( struct vertex_program *program, /* Initialize cp. Note that ctx and VB aren't used in compilation * so we don't have to worry about statechanges: */ - memset(&cp, 0, sizeof(cp)); + _mesa_memset(&cp, 0, sizeof(cp)); cp.csr = p->instructions; /* Compile instructions: diff --git a/src/mesa/tnl/t_vb_arbprogram_sse.c b/src/mesa/tnl/t_vb_arbprogram_sse.c index 330d30efb9..c5da430dd3 100644 --- a/src/mesa/tnl/t_vb_arbprogram_sse.c +++ b/src/mesa/tnl/t_vb_arbprogram_sse.c @@ -1181,7 +1181,7 @@ _tnl_sse_codegen_vertex_program(struct tnl_compiled_program *p) { struct compilation cp; - memset(&cp, 0, sizeof(cp)); + _mesa_memset(&cp, 0, sizeof(cp)); cp.p = p; cp.have_sse2 = 1; diff --git a/src/mesa/tnl/t_vertex_sse.c b/src/mesa/tnl/t_vertex_sse.c index 13dc2f4d53..ad4cc62d5f 100644 --- a/src/mesa/tnl/t_vertex_sse.c +++ b/src/mesa/tnl/t_vertex_sse.c @@ -637,7 +637,7 @@ void _tnl_generate_sse_emit( GLcontext *ctx ) return; } - memset(&p, 0, sizeof(p)); + _mesa_memset(&p, 0, sizeof(p)); p.ctx = ctx; p.inputs_safe = 0; /* for now */ diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index e62c5b374c..3e77758edb 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -1406,7 +1406,7 @@ static void *search_cache( struct tnl_cache *cache, struct tnl_cache *c; for (c = cache; c; c = c->next) { - if (c->hash == hash && memcmp(c->key, key, keysize) == 0) + if (c->hash == hash && _mesa_memcmp(c->key, key, keysize) == 0) return c->data; } diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c index fa9e04ad33..ae2056971e 100644 --- a/src/mesa/tnl/t_vtx_api.c +++ b/src/mesa/tnl/t_vtx_api.c @@ -943,7 +943,7 @@ void _tnl_vtx_init( GLcontext *ctx ) _mesa_install_exec_vtxfmt( ctx, &tnl->exec_vtxfmt ); - memcpy( tnl->vtx.tabfv, choose, sizeof(choose) ); + _mesa_memcpy( tnl->vtx.tabfv, choose, sizeof(choose) ); for (i = 0 ; i < _TNL_ATTRIB_MAX ; i++) tnl->vtx.attrsz[i] = 0; diff --git a/src/mesa/tnl/t_vtx_x86.c b/src/mesa/tnl/t_vtx_x86.c index 38cdad451c..1812cfa471 100644 --- a/src/mesa/tnl/t_vtx_x86.c +++ b/src/mesa/tnl/t_vtx_x86.c @@ -90,7 +90,7 @@ EXTERN( _tnl_x86_choose_fv ); insert_at_head( &CACHE, dfn ); \ dfn->key = KEY; \ dfn->code = ALIGN_MALLOC( end - start, 16 ); \ - memcpy (dfn->code, start, end - start) + _mesa_memcpy (dfn->code, start, end - start) @@ -277,7 +277,7 @@ do { \ const char *end = WARP##_end; \ int offset = 0; \ code = ALIGN_MALLOC( end - start, 16 ); \ - memcpy (code, start, end - start); \ + _mesa_memcpy (code, start, end - start); \ FIXUP(code, 0, 0, (int)&(TNL_CONTEXT(ctx)->vtx.tabfv[ATTR][SIZE-1]));\ *(void **)&vfmt->FUNC = code; \ } while (0) @@ -351,7 +351,7 @@ void _tnl_x86choosers( tnl_attrfv_func (*choose)[4], const char *end = _tnl_x86_choose_fv_end; int offset = 0; code = ALIGN_MALLOC( end - start, 16 ); - memcpy (code, start, end - start); + _mesa_memcpy (code, start, end - start); FIXUP(code, 0, 0, attr); FIXUP(code, 0, 1, size + 1); FIXUPREL(code, 0, 2, do_choose); -- cgit v1.2.3