s/memcpy/_mesa_memcpy/, s/FREE/_mesa_free/

diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.c b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
index 61a757c..f42a046 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.c
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
@@ -1173,7 +1173,7 @@ static void free_funcs( struct dynfn *l )
    foreach_s (f, tmp, l) {
       remove_from_list( f );
       _mesa_exec_free( f->code );
-      FREE( f );
+      _mesa_free( f );
    }
 }
 

diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.h b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
index 32a21c4..4699919 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.h
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
@@ -57,10 +57,10 @@ do {                                                        \
    char *start = (char *)&FUNC;                                \
    char *end = (char *)&FUNC##_end;                    \
    insert_at_head( &CACHE, dfn );                      \
-   dfn->key[0] = key[0];                                       \
-   dfn->key[1] = key[1];                                       \
-   dfn->code = _mesa_exec_malloc( end - start );               \
-   memcpy (dfn->code, start, end - start);             \
+   dfn->key[0] = key[0];                               \
+   dfn->key[1] = key[1];                               \
+   dfn->code = _mesa_exec_malloc( end - start );       \
+   _mesa_memcpy(dfn->code, start, end - start);                \
 }                                                      \
 while ( 0 )
 

diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
index 537a1c0..3b3f459 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
@@ -1039,7 +1039,7 @@ static void free_funcs( struct dynfn *l )
    foreach_s (f, tmp, l) {
       remove_from_list( f );
       _mesa_exec_free( f->code );
-      FREE( f );
+      _mesa_free( f );
    }
 }
 

diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
index a7d5b83..a656e49 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
@@ -56,8 +56,8 @@ do {                                                  \
    char *end = (char *)&FUNC##_end;                    \
    insert_at_head( &CACHE, dfn );                      \
    dfn->key = key;                                     \
-   dfn->code = _mesa_exec_malloc( end - start );               \
-   memcpy (dfn->code, start, end - start);             \
+   dfn->code = _mesa_exec_malloc( end - start );       \
+   _mesa_memcpy(dfn->code, start, end - start);                \
 }                                                      \
 while ( 0 )