On 2015-03-23 17:38:00, Kenneth Graunke wrote: > Everything is already in place; we simply have to take the scalar code > generation path. This gives us SIMD8 VS programs, instead of SIMD4x2. > > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> > --- > src/mesa/drivers/dri/i965/brw_vec4.cpp | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp > b/src/mesa/drivers/dri/i965/brw_vec4.cpp > index 918519c..21de1af 100644 > --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp > +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp > @@ -1823,7 +1823,7 @@ brw_vs_emit(struct brw_context *brw, > if (unlikely(INTEL_DEBUG & DEBUG_VS)) > brw_dump_ir("vertex", prog, &shader->base, &c->vp->program.Base); > > - if (prog && brw->gen >= 8 && brw->scalar_vs) { > + if (brw->gen >= 8 && brw->scalar_vs && (prog || getenv("INTEL_USE_NIR"))) > {
We should be able to leave out the brw->gen >= 8 check, right? -Jordan > fs_visitor v(brw, mem_ctx, &c->key, prog_data, prog, &c->vp->program, > 8); > if (!v.run_vs()) { > if (prog) { > @@ -1841,9 +1841,15 @@ brw_vs_emit(struct brw_context *brw, > &c->vp->program.Base, v.promoted_constants, > v.runtime_check_aads_emit, "VS"); > if (INTEL_DEBUG & DEBUG_VS) { > - char *name = ralloc_asprintf(mem_ctx, "%s vertex shader %d", > - prog->Label ? prog->Label : "unnamed", > - prog->Name); > + char *name; > + if (prog) { > + name = ralloc_asprintf(mem_ctx, "%s vertex shader %d", > + prog->Label ? prog->Label : "unnamed", > + prog->Name); > + } else { > + name = ralloc_asprintf(mem_ctx, "vertex program %d", > + c->vp->program.Base.Id); > + } > g.enable_debug(name); > } > g.generate_code(v.cfg, 8); > -- > 2.3.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev