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

r300: Removed the (undocumented) MAD_2 opcode.

Browse source 
This opcode is likely a mistake from reverse engineering. MAD_2 isn't included
in AMD's documentation, and my testing reviles there is no problem using the
documented MAD opcode.
This commit is contained in:
Oliver McFadden 2008-02-28 09:27:15 +00:00
parent 7e1878cdad
commit 7504981074
2 changed files with 6 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/r300/r300_reg.h
View file

@ -2508,9 +2508,6 @@ enum {
/*\{*/
/* FIXME */
#define R300_VPI_OUT_OP_MAD_2 (128 << 0)
#define R300_VPI_OUT_REG_INDEX_SHIFT 13
/* GUESS based on fglrx native limits */
#define R300_VPI_OUT_REG_INDEX_MASK (31 << 13)

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

@ -387,18 +387,9 @@ static GLuint *t_opcode_add(struct r300_vertex_program *vp,
struct prog_instruction *vpi, GLuint * inst,
struct prog_src_register src[3])
{
unsigned long hw_op;
#if 1
if (src[0].File == PROGRAM_TEMPORARY
&& src[1].File == PROGRAM_TEMPORARY) {
hw_op = R300_VPI_OUT_OP_MAD_2;
} else {
hw_op = VE_MULTIPLY_ADD;
}
inst[0] =
PVS_VECTOR_OPCODE(hw_op, t_dst_index(vp, &vpi->DstReg),
PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
t_dst_class(vpi->DstReg.File));
inst[1] = ONE_SRC_0;
@ -412,7 +403,6 @@ static GLuint *t_opcode_add(struct r300_vertex_program *vp,
inst[1] = t_src(vp, &src[0]);
inst[2] = t_src(vp, &src[1]);
inst[3] = ZERO_SRC_1;
#endif
return inst;
@ -699,17 +689,8 @@ static GLuint *t_opcode_mad(struct r300_vertex_program *vp,
struct prog_instruction *vpi, GLuint * inst,
struct prog_src_register src[3])
{
unsigned long hw_op;
if (src[0].File == PROGRAM_TEMPORARY
&& src[1].File == PROGRAM_TEMPORARY) {
hw_op = R300_VPI_OUT_OP_MAD_2;
} else {
hw_op = VE_MULTIPLY_ADD;
}
inst[0] =
PVS_VECTOR_OPCODE(hw_op, t_dst_index(vp, &vpi->DstReg),
PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
t_dst_class(vpi->DstReg.File));
inst[1] = t_src(vp, &src[0]);
@ -766,15 +747,8 @@ static GLuint *t_opcode_mov(struct r300_vertex_program *vp,
inst[2] = ZERO_SRC_0;
inst[3] = ZERO_SRC_0;
#else
if (src[0].File == PROGRAM_TEMPORARY
&& src[1].File == PROGRAM_TEMPORARY) {
hw_op = R300_VPI_OUT_OP_MAD_2;
} else {
hw_op = VE_MULTIPLY_ADD;
}
inst[0] =
PVS_VECTOR_OPCODE(hw_op, t_dst_index(vp, &vpi->DstReg),
PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
t_dst_class(vpi->DstReg.File));
inst[1] = t_src(vp, &src[0]);
@ -789,19 +763,8 @@ static GLuint *t_opcode_mul(struct r300_vertex_program *vp,
struct prog_instruction *vpi, GLuint * inst,
struct prog_src_register src[3])
{
unsigned long hw_op;
// HW mul can take third arg but appears to have some other limitations.
if (src[0].File == PROGRAM_TEMPORARY
&& src[1].File == PROGRAM_TEMPORARY) {
hw_op = R300_VPI_OUT_OP_MAD_2;
} else {
hw_op = VE_MULTIPLY_ADD;
}
inst[0] =
PVS_VECTOR_OPCODE(hw_op, t_dst_index(vp, &vpi->DstReg),
PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
t_dst_class(vpi->DstReg.File));
inst[1] = t_src(vp, &src[0]);
@ -895,20 +858,10 @@ static GLuint *t_opcode_sub(struct r300_vertex_program *vp,
struct prog_instruction *vpi, GLuint * inst,
struct prog_src_register src[3])
{
unsigned long hw_op;
//ADD RESULT 1.X Y Z W TMP 0{} {X Y Z W} PARAM 1{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W
#if 1
if (src[0].File == PROGRAM_TEMPORARY
&& src[1].File == PROGRAM_TEMPORARY) {
hw_op = R300_VPI_OUT_OP_MAD_2;
} else {
hw_op = VE_MULTIPLY_ADD;
}
inst[0] =
PVS_VECTOR_OPCODE(hw_op, t_dst_index(vp, &vpi->DstReg),
PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
t_dst_class(vpi->DstReg.File));
inst[1] = t_src(vp, &src[0]);
@ -961,15 +914,8 @@ static GLuint *t_opcode_swz(struct r300_vertex_program *vp,
inst[2] = ZERO_SRC_0;
inst[3] = ZERO_SRC_0;
#else
if (src[0].File == PROGRAM_TEMPORARY
&& src[1].File == PROGRAM_TEMPORARY) {
hw_op = R300_VPI_OUT_OP_MAD_2;
} else {
hw_op = VE_MULTIPLY_ADD;
}
inst[0] =
PVS_VECTOR_OPCODE(hw_op, t_dst_index(vp, &vpi->DstReg),
PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
t_dst_class(vpi->DstReg.File));
inst[1] = t_src(vp, &src[0]);
@ -986,7 +932,6 @@ static GLuint *t_opcode_xpd(struct r300_vertex_program *vp,
{
/* mul r0, r1.yzxw, r2.zxyw
mad r0, -r2.yzxw, r1.zxyw, r0
NOTE: might need MAD_2
*/
inst[0] =