summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-10-02 16:40:14 -0700
committerKenneth Graunke <kenneth@whitecape.org>2015-10-04 14:00:01 -0700
commitb85757bc72350df609f50e000512bc80d07f1497 (patch)
tree8bc0a9867ed754d1888f74a049dc36b4f3c2e3de
parent21585048a2e21ea9726e7f0b9f9fd98d1105295c (diff)
i965: Remove shader_prog from vec4_gs_visitor.
Unfortunately it has to stay in gen6_gs_visitor. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp6
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h3
-rw-r--r--src/mesa/drivers/dri/i965/gen6_gs_visitor.h9
3 files changed, 9 insertions, 9 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 74ef7286721..f6967a74d4e 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
@@ -37,7 +37,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,
nir_shader *shader,
void *mem_ctx,
bool no_spills,
@@ -45,7 +44,6 @@ vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler,
: vec4_visitor(compiler, log_data, &c->key.tex,
&c->prog_data.base, shader, mem_ctx,
no_spills, shader_time_index),
- shader_prog(prog),
c(c)
{
}
@@ -641,7 +639,7 @@ brw_gs_emit(struct brw_context *brw,
c->prog_data.base.dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT;
vec4_gs_visitor v(brw->intelScreen->compiler, brw,
- c, prog, shader->Program->nir,
+ c, shader->Program->nir,
mem_ctx, true /* no_spills */, st_index);
if (v.run()) {
return generate_assembly(brw, prog, &c->gp->program.Base,
@@ -684,7 +682,7 @@ brw_gs_emit(struct brw_context *brw,
if (brw->gen >= 7)
gs = new vec4_gs_visitor(brw->intelScreen->compiler, brw,
- c, prog, shader->Program->nir,
+ c, shader->Program->nir,
mem_ctx, false /* no_spills */,
st_index);
else
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
index 85d80b8fc63..da93f0dc1c6 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
@@ -70,7 +70,6 @@ public:
vec4_gs_visitor(const struct brw_compiler *compiler,
void *log_data,
struct brw_gs_compile *c,
- struct gl_shader_program *prog,
nir_shader *shader,
void *mem_ctx,
bool no_spills,
@@ -97,8 +96,6 @@ protected:
void emit_control_data_bits();
void set_stream_control_data_bits(unsigned stream_id);
- struct gl_shader_program *shader_prog;
-
src_reg vertex_count;
src_reg control_data_bits;
const struct brw_gs_compile * const c;
diff --git a/src/mesa/drivers/dri/i965/gen6_gs_visitor.h b/src/mesa/drivers/dri/i965/gen6_gs_visitor.h
index 41c6d183acd..e75d6aa10b8 100644
--- a/src/mesa/drivers/dri/i965/gen6_gs_visitor.h
+++ b/src/mesa/drivers/dri/i965/gen6_gs_visitor.h
@@ -43,8 +43,11 @@ public:
void *mem_ctx,
bool no_spills,
int shader_time_index) :
- vec4_gs_visitor(comp, log_data, c, prog, shader, mem_ctx, no_spills,
- shader_time_index) {}
+ vec4_gs_visitor(comp, log_data, c, shader, mem_ctx, no_spills,
+ shader_time_index),
+ shader_prog(prog)
+ {
+ }
protected:
virtual void emit_prolog();
@@ -64,6 +67,8 @@ private:
void xfb_setup();
int get_vertex_output_offset_for_varying(int vertex, int varying);
+ const struct gl_shader_program *shader_prog;
+
src_reg vertex_output;
src_reg vertex_output_offset;
src_reg temp;