mesa: Branch 'master'

[Oliver McFadden]

 src/mesa/shader/programopt.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree cfe984dbd0c478906785dbf8a9430504173ae952 (from ee5b7f0574c6c5bce9ab75a2825f1fe089a57fa5)
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Sun Mar 18 07:21:21 2007 +0000

    Use _mesa_copy_instructions rather than memcpy in _mesa_insert_mvp_code.

diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index dca44c8..fed8e5b 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -100,8 +100,7 @@ _mesa_insert_mvp_code(GLcontext *ctx, st
    }
 
    /* Append original instructions after new instructions */
-   _mesa_memcpy(newInst + 4, vprog->Base.Instructions,
-                origLen * sizeof(struct prog_instruction));
+   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
 
    /* free old instructions */
    _mesa_free(vprog->Base.Instructions);