fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300: Added _mesa_copy_instructions.

Browse source
This commit is contained in:
Oliver McFadden 2007-03-15 20:55:30 +00:00
parent 1195caa274
commit 0c25d9ab19
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/r300/r300_fragprog.c
View file

@ -1853,7 +1853,7 @@ static void insert_wpos(struct gl_program *prog)
fpi[i].SrcReg[2].Swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_ZERO);
i++;
_mesa_memcpy(&fpi[i], prog->Instructions, prog->NumInstructions * sizeof(struct prog_instruction));
_mesa_copy_instructions (&fpi[i], prog->Instructions, prog->NumInstructions);
free(prog->Instructions);

9
src/mesa/drivers/dri/r300/r300_vertprog.c
View file

@ -946,7 +946,7 @@ static void position_invariant(struct gl_program *prog)
#endif
}
_mesa_memcpy(&vpi[i], prog->Instructions, prog->NumInstructions * sizeof(struct prog_instruction));
_mesa_copy_instructions (&vpi[i], prog->Instructions, prog->NumInstructions);
free(prog->Instructions);
@ -969,10 +969,11 @@ static void insert_wpos(struct r300_vertex_program *vp,
vpi = _mesa_alloc_instructions (prog->NumInstructions + 2);
_mesa_init_instructions (vpi, prog->NumInstructions + 2);
/* all but END */
_mesa_memcpy(vpi, prog->Instructions, (prog->NumInstructions - 1) * sizeof(struct prog_instruction));
_mesa_copy_instructions (vpi, prog->Instructions, prog->NumInstructions - 1);
/* END */
_mesa_memcpy(&vpi[prog->NumInstructions + 1], &prog->Instructions[prog->NumInstructions - 1],
sizeof(struct prog_instruction));
_mesa_copy_instructions (&vpi[prog->NumInstructions + 1],
&prog->Instructions[prog->NumInstructions - 1],
1);
vpi_insert = &vpi[prog->NumInstructions - 1];
vpi_insert[i].Opcode = OPCODE_MOV;

14
src/mesa/shader/program.c
View file

@ -1480,6 +1480,20 @@ _mesa_realloc_instructions(struct prog_instruction *oldInst,
return newInst;
}
/**
* Copy an narray of program instructions.
* \param dest pointer to destination.
* \param src pointer to source.
* \param n number of instructions to copy.
* \return pointer to destination.
*/
struct prog_instruction *
_mesa_copy_instructions(struct prog_instruction *dest,
const struct prog_instruction *src, GLuint n)
{
return _mesa_memcpy (dest, src, n * sizeof (struct prog_instruction));
}
/**
* Basic info about each instruction

3
src/mesa/shader/program.h
View file

@ -128,6 +128,9 @@ extern struct prog_instruction *
_mesa_realloc_instructions(struct prog_instruction *oldInst,
GLuint numOldInst, GLuint numNewInst);
extern struct prog_instruction *
_mesa_copy_instructions(struct prog_instruction *dest,
const struct prog_instruction *src, GLuint n);
/**
* Used for describing GL state referenced from inside ARB vertex and