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

r300: Removed the duplicate dest register defines.

Browse source
This commit is contained in:
Oliver McFadden 2008-02-25 12:26:48 +00:00
parent 8a646b80ef
commit 66952fa5ae
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1659,7 +1659,7 @@ static void r300SetupDefaultVertexProgram(r300ContextPtr rmesa)
for (i = VERT_ATTRIB_POS; i < VERT_ATTRIB_MAX; i++) {
if (rmesa->state.sw_tcl_inputs[i] != -1) {
prog->program.body.i[program_end + 0] = MAKE_VSF_OP(R300_VPI_OUT_OP_MUL, o_reg++, VSF_FLAG_ALL, VSF_OUT_CLASS_RESULT);
prog->program.body.i[program_end + 0] = MAKE_VSF_OP(R300_VPI_OUT_OP_MUL, o_reg++, VSF_FLAG_ALL, PVS_DST_REG_OUT);
prog->program.body.i[program_end + 1] = VSF_REG(rmesa->state.sw_tcl_inputs[i]);
prog->program.body.i[program_end + 2] = VSF_ATTR_UNITY(rmesa->state.sw_tcl_inputs[i]);
prog->program.body.i[program_end + 3] = VSF_UNITY(rmesa->state.sw_tcl_inputs[i]);

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

@ -174,11 +174,11 @@ static unsigned long t_dst_class(enum register_file file)
switch (file) {
case PROGRAM_TEMPORARY:
return VSF_OUT_CLASS_TMP;
return PVS_DST_REG_TEMPORARY;
case PROGRAM_OUTPUT:
return VSF_OUT_CLASS_RESULT;
return PVS_DST_REG_OUT;
case PROGRAM_ADDRESS:
return VSF_OUT_CLASS_ADDR;
return PVS_DST_REG_A0;
/*
case PROGRAM_INPUT:
case PROGRAM_LOCAL_PARAM:
@ -580,7 +580,7 @@ static GLuint *t_opcode_flr(struct r300_vertex_program *vp,
inst[0] =
MAKE_VSF_OP(R300_VPI_OUT_OP_FRC, *u_temp_i,
t_dst_mask(vpi->DstReg.WriteMask),
VSF_OUT_CLASS_TMP);
PVS_DST_REG_TEMPORARY);
inst[1] = t_src(vp, &src[0]);
inst[2] = ZERO_SRC_0;
@ -994,7 +994,7 @@ static GLuint *t_opcode_xpd(struct r300_vertex_program *vp,
inst[0] =
MAKE_VSF_OP(R300_VPI_OUT_OP_MAD, *u_temp_i,
t_dst_mask(vpi->DstReg.WriteMask),
VSF_OUT_CLASS_TMP);
PVS_DST_REG_TEMPORARY);
inst[1] = MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), t_swizzle(GET_SWZ(src[0].Swizzle, 1)), // y
t_swizzle(GET_SWZ(src[0].Swizzle, 2)), // z
@ -1149,7 +1149,7 @@ static void r300TranslateVertexShader(struct r300_vertex_program *vp,
inst[0] =
MAKE_VSF_OP(R300_VPI_OUT_OP_ADD,
u_temp_i, VSF_FLAG_ALL,
VSF_OUT_CLASS_TMP);
PVS_DST_REG_TEMPORARY);
inst[1] =
MAKE_VSF_SOURCE(t_src_index
@ -1177,7 +1177,7 @@ static void r300TranslateVertexShader(struct r300_vertex_program *vp,
inst[0] =
MAKE_VSF_OP(R300_VPI_OUT_OP_ADD,
u_temp_i, VSF_FLAG_ALL,
VSF_OUT_CLASS_TMP);
PVS_DST_REG_TEMPORARY);
inst[1] =
MAKE_VSF_SOURCE(t_src_index

4
src/mesa/drivers/dri/r300/r300_vertprog.h
View file

@ -11,10 +11,6 @@
#define VSF_FLAG_ALL 0xf
#define VSF_FLAG_NONE 0
#define VSF_OUT_CLASS_TMP 0
#define VSF_OUT_CLASS_ADDR 1
#define VSF_OUT_CLASS_RESULT 2
/* first DWORD of an instruction */
/* possible operations: