Revert "i965: VS use SPF mode on sandybridge for now"

This reverts commit 9c39a9fcb2.

Remove VS SPF mode, conditional instruction works for VS now.
This commit is contained in:
Zhenyu Wang 2010-11-10 08:17:45 -05:00
parent 9249af17b8
commit 65972f992f
2 changed files with 1 additions and 5 deletions

View file

@ -1685,10 +1685,6 @@ void brw_vs_emit(struct brw_vs_compile *c )
printf("\n");
}
/* FIXME Need to fix conditional instruction to remove this */
if (intel->gen >= 6)
p->single_program_flow = GL_TRUE;
brw_set_compression_control(p, BRW_COMPRESSION_NONE);
brw_set_access_mode(p, BRW_ALIGN_16);
if_depth_in_loop[loop_depth] = 0;

View file

@ -135,7 +135,7 @@ upload_vs_state(struct brw_context *brw)
BEGIN_BATCH(6);
OUT_BATCH(CMD_3D_VS_STATE << 16 | (6 - 2));
OUT_RELOC(brw->vs.prog_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
OUT_BATCH(GEN6_VS_SPF_MODE | (0 << GEN6_VS_SAMPLER_COUNT_SHIFT) |
OUT_BATCH((0 << GEN6_VS_SAMPLER_COUNT_SHIFT) |
(brw->vs.nr_surfaces << GEN6_VS_BINDING_TABLE_ENTRY_COUNT_SHIFT));
OUT_BATCH(0); /* scratch space base offset */
OUT_BATCH((1 << GEN6_VS_DISPATCH_START_GRF_SHIFT) |