diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2015-08-27 23:49:03 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2015-09-03 22:31:03 -0700 |
| commit | 014b90221ad5cf833bfdd55b0336771d209f0f1d (patch) | |
| tree | d7a23e19ddacb406048e6e3d49ff409cda4540b6 /src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | |
| parent | 082b7f1876095f32578720f30fdc35771b2b3e0a (diff) | |
| download | external_mesa3d-014b90221ad5cf833bfdd55b0336771d209f0f1d.zip external_mesa3d-014b90221ad5cf833bfdd55b0336771d209f0f1d.tar.gz external_mesa3d-014b90221ad5cf833bfdd55b0336771d209f0f1d.tar.bz2 | |
i965: Move legacy clip plane handling to vec4_vs_visitor.
This is now only used for the vertex shader, so it makes sense to get it
out of any paths run by the geometry shader.
Instead of passing the gl_clip_plane array into the run() method (which
is shared among all subclasses), we add it as a vec4_vs_visitor
constructor parameter. This eliminates the bogus NULL parameter in the
GS case.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 019efec..4fd626f 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -679,7 +679,7 @@ brw_gs_emit(struct brw_context *brw, vec4_gs_visitor v(brw->intelScreen->compiler, brw, c, prog, mem_ctx, true /* no_spills */, st_index); - if (v.run(NULL /* clip planes */)) { + if (v.run()) { return generate_assembly(brw, prog, &c->gp->program.Base, &c->prog_data.base, mem_ctx, v.cfg, final_assembly_size); @@ -727,7 +727,7 @@ brw_gs_emit(struct brw_context *brw, c, prog, mem_ctx, false /* no_spills */, st_index); - if (!gs->run(NULL /* clip planes */)) { + if (!gs->run()) { prog->LinkStatus = false; ralloc_strcat(&prog->InfoLog, gs->fail_msg); } else { |