diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2015-06-29 21:58:47 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2015-07-09 17:06:16 -0700 |
commit | 0163c99e8f6959b5d6c7a937a322127cfdf9315f (patch) | |
tree | 55c933fd1210a26ee0aa50625e0ff41025503ad9 /src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | |
parent | 308c0bf74307af0f3385cdcbb00aa0534ec3e5da (diff) | |
download | external_mesa3d-0163c99e8f6959b5d6c7a937a322127cfdf9315f.zip external_mesa3d-0163c99e8f6959b5d6c7a937a322127cfdf9315f.tar.gz external_mesa3d-0163c99e8f6959b5d6c7a937a322127cfdf9315f.tar.bz2 |
i965/vec4: Plumb log_data through so the backend_shader field gets set.
Jason plumbed this through a while back in the FS backend, but
apparently we were just passing NULL in the vec4 backend.
This patch passes brw in as intended.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
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 | 10 |
1 files changed, 6 insertions, 4 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 69bcf5a..80c59af 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -35,12 +35,14 @@ const unsigned MAX_GS_INPUT_VERTICES = 6; namespace brw { vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler, + void *log_data, struct brw_gs_compile *c, struct gl_shader_program *prog, void *mem_ctx, bool no_spills, int shader_time_index) - : vec4_visitor(compiler, &c->base, &c->gp->program.Base, &c->key.base, + : vec4_visitor(compiler, log_data, + &c->base, &c->gp->program.Base, &c->key.base, &c->prog_data.base, prog, MESA_SHADER_GEOMETRY, mem_ctx, no_spills, shader_time_index), c(c) @@ -662,7 +664,7 @@ brw_gs_emit(struct brw_context *brw, likely(!(INTEL_DEBUG & DEBUG_NO_DUAL_OBJECT_GS))) { c->prog_data.base.dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; - vec4_gs_visitor v(brw->intelScreen->compiler, + vec4_gs_visitor v(brw->intelScreen->compiler, brw, c, prog, mem_ctx, true /* no_spills */, st_index); if (v.run(NULL /* clip planes */)) { return generate_assembly(brw, prog, &c->gp->program.Base, @@ -704,11 +706,11 @@ brw_gs_emit(struct brw_context *brw, const unsigned *ret = NULL; if (brw->gen >= 7) - gs = new vec4_gs_visitor(brw->intelScreen->compiler, + gs = new vec4_gs_visitor(brw->intelScreen->compiler, brw, c, prog, mem_ctx, false /* no_spills */, st_index); else - gs = new gen6_gs_visitor(brw->intelScreen->compiler, + gs = new gen6_gs_visitor(brw->intelScreen->compiler, brw, c, prog, mem_ctx, false /* no_spills */, st_index); |