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

r300-gallium: vs: Fix vert shader init.

Browse source 
Makes the last three commits suck much less. :3
This commit is contained in:
Corbin Simpson 2009-05-17 10:33:56 -07:00
parent 8dae8f28e5
commit 45435abcb9
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/drivers/r300/r300_state_tcl.c
View file

@ -325,6 +325,8 @@ static void r300_vs_init(struct r300_vertex_shader* vs,
break;
}
}
vs->instruction_count = 0;
}
void r300_translate_vertex_shader(struct r300_context* r300,
@ -334,8 +336,6 @@ void r300_translate_vertex_shader(struct r300_context* r300,
int i;
struct r300_constant_buffer* consts =
&r300->shader_constants[PIPE_SHADER_VERTEX];
boolean end = FALSE;
int spurious = 0;
struct r300_vs_asm* assembler = CALLOC_STRUCT(r300_vs_asm);
if (assembler == NULL) {
@ -375,16 +375,8 @@ void r300_translate_vertex_shader(struct r300_context* r300,
assembler->imm_count++;
break;
case TGSI_TOKEN_TYPE_INSTRUCTION:
if (parser.FullToken.FullInstruction.Instruction.Opcode ==
TGSI_OPCODE_END) {
end = TRUE;
}
if (end) {
spurious++;
} else {
r300_vs_instruction(vs, assembler,
&parser.FullToken.FullInstruction);
}
r300_vs_instruction(vs, assembler,
&parser.FullToken.FullInstruction);
break;
}
}
@ -401,9 +393,6 @@ void r300_translate_vertex_shader(struct r300_context* r300,
debug_printf("r300: vs: tab: %d %d %d %d\n", assembler->tab[0],
assembler->tab[1], assembler->tab[2], assembler->tab[3]);
debug_printf("r300: vs: %d spurious instructions following END\n",
spurious - 1);
tgsi_dump(vs->state.tokens);
/* XXX finish r300 vertex shader dumper */
r300_vs_dump(vs);