diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-23 17:00:28 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-23 17:00:28 +0800 |
| commit | ad76128204d856527e033a83c1b5a35a2f52ba92 (patch) | |
| tree | 0a47ad896efc108a69795e44607b04738c216330 /src/mesa/main/texenvprogram.c | |
| parent | 2eb656ef4f4c7a365501e615a43ae72cfdc12cda (diff) | |
| parent | 002762b13aa58ca569a564bb64672e343611c9ed (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 5038b9b0c3..d1994f76d1 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -1013,7 +1013,7 @@ create_new_program(GLcontext *ctx, struct state_key *key, p.program->NumTexIndirections = 1; /* correct? */ p.program->NumTexInstructions = 0; p.program->NumAluInstructions = 0; - p.program->Base.String = 0; + p.program->Base.String = NULL; p.program->Base.NumInstructions = p.program->Base.NumTemporaries = p.program->Base.NumParameters = @@ -1102,9 +1102,8 @@ create_new_program(GLcontext *ctx, struct state_key *key, "generating tex env program"); return; } - _mesa_memcpy(program->Base.Instructions, instBuffer, - sizeof(struct prog_instruction) - * program->Base.NumInstructions); + _mesa_copy_instructions(program->Base.Instructions, instBuffer, + program->Base.NumInstructions); /* Notify driver the fragment program has (actually) changed. */ |