fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 20:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: Remove shader_prog from vec4_gs_visitor.

Browse source 
Unfortunately it has to stay in gen6_gs_visitor.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Kenneth Graunke 2015-10-02 16:40:14 -07:00
parent 21585048a2
commit b85757bc72
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
View file

@ -37,7 +37,6 @@ namespace brw {
vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler, vec4_gs_visitor::vec4_gs_visitor(const struct brw_compiler *compiler,
void *log_data, void *log_data,
struct brw_gs_compile *c, struct brw_gs_compile *c,
struct gl_shader_program *prog,
nir_shader *shader, nir_shader *shader,
void *mem_ctx, void *mem_ctx,
bool no_spills, 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, : vec4_visitor(compiler, log_data, &c->key.tex,
&c->prog_data.base, shader, mem_ctx, &c->prog_data.base, shader, mem_ctx,
no_spills, shader_time_index), no_spills, shader_time_index),
shader_prog(prog),
c(c) c(c)
{ {
} }
@ -641,7 +639,7 @@ brw_gs_emit(struct brw_context *brw,
c->prog_data.base.dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT; c->prog_data.base.dispatch_mode = DISPATCH_MODE_4X2_DUAL_OBJECT;
vec4_gs_visitor v(brw->intelScreen->compiler, brw, vec4_gs_visitor v(brw->intelScreen->compiler, brw,
c, prog, shader->Program->nir, c, shader->Program->nir,
mem_ctx, true /* no_spills */, st_index); mem_ctx, true /* no_spills */, st_index);
if (v.run()) { if (v.run()) {
return generate_assembly(brw, prog, &c->gp->program.Base, return generate_assembly(brw, prog, &c->gp->program.Base,
@ -684,7 +682,7 @@ brw_gs_emit(struct brw_context *brw,
if (brw->gen >= 7) if (brw->gen >= 7)
gs = new vec4_gs_visitor(brw->intelScreen->compiler, brw, gs = new vec4_gs_visitor(brw->intelScreen->compiler, brw,
c, prog, shader->Program->nir, c, shader->Program->nir,
mem_ctx, false /* no_spills */, mem_ctx, false /* no_spills */,
st_index); st_index);
else else

3
src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
View file

@ -70,7 +70,6 @@ public:
vec4_gs_visitor(const struct brw_compiler *compiler, vec4_gs_visitor(const struct brw_compiler *compiler,
void *log_data, void *log_data,
struct brw_gs_compile *c, struct brw_gs_compile *c,
struct gl_shader_program *prog,
nir_shader *shader, nir_shader *shader,
void *mem_ctx, void *mem_ctx,
bool no_spills, bool no_spills,
@ -97,8 +96,6 @@ protected:
void emit_control_data_bits(); void emit_control_data_bits();
void set_stream_control_data_bits(unsigned stream_id); void set_stream_control_data_bits(unsigned stream_id);
struct gl_shader_program *shader_prog;
src_reg vertex_count; src_reg vertex_count;
src_reg control_data_bits; src_reg control_data_bits;
const struct brw_gs_compile * const c; const struct brw_gs_compile * const c;

9
src/mesa/drivers/dri/i965/gen6_gs_visitor.h
View file

@ -43,8 +43,11 @@ public:
void *mem_ctx, void *mem_ctx,
bool no_spills, bool no_spills,
int shader_time_index) : int shader_time_index) :
vec4_gs_visitor(comp, log_data, c, prog, shader, mem_ctx, no_spills, vec4_gs_visitor(comp, log_data, c, shader, mem_ctx, no_spills,
shader_time_index) {} shader_time_index),
shader_prog(prog)
{
}
protected: protected:
virtual void emit_prolog(); virtual void emit_prolog();
@ -64,6 +67,8 @@ private:
void xfb_setup(); void xfb_setup();
int get_vertex_output_offset_for_varying(int vertex, int varying); 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;
src_reg vertex_output_offset; src_reg vertex_output_offset;
src_reg temp; src_reg temp;