i965/vs: Make vec4_vs_visitor class derived from vec4_visitor.

This patch just creates the derived class; later patches will migrate
VS-specific functions and data structures from the base class into the
derived class.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Paul Berry 2013-02-15 20:12:13 -08:00
parent 5fff3752c8
commit e9be5a05f7
4 changed files with 37 additions and 2 deletions

View file

@ -1532,7 +1532,7 @@ brw_vs_emit(struct brw_context *brw,
}
}
vec4_visitor v(brw, c, prog_data, prog, shader, mem_ctx);
vec4_vs_visitor v(brw, c, prog_data, prog, shader, mem_ctx);
if (!v.run()) {
prog->LinkStatus = false;
ralloc_strcat(&prog->InfoLog, v.fail_msg);

View file

@ -486,6 +486,17 @@ public:
void dump_instructions();
};
class vec4_vs_visitor : public vec4_visitor
{
public:
vec4_vs_visitor(struct brw_context *brw,
struct brw_vs_compile *c,
struct brw_vs_prog_data *prog_data,
struct gl_shader_program *prog,
struct brw_shader *shader,
void *mem_ctx);
};
/**
* The vertex shader code generator.
*

View file

@ -3033,6 +3033,17 @@ vec4_visitor::~vec4_visitor()
}
vec4_vs_visitor::vec4_vs_visitor(struct brw_context *brw,
struct brw_vs_compile *c,
struct brw_vs_prog_data *prog_data,
struct gl_shader_program *prog,
struct brw_shader *shader,
void *mem_ctx)
: vec4_visitor(brw, c, prog_data, prog, shader, mem_ctx)
{
}
void
vec4_visitor::fail(const char *format, ...)
{

View file

@ -42,6 +42,19 @@ public:
vec4_visitor *v;
};
class register_coalesce_vec4_visitor : public vec4_visitor
{
public:
register_coalesce_vec4_visitor(struct brw_context *brw,
struct brw_vs_compile *c,
struct gl_shader_program *shader_prog)
: vec4_visitor(brw, c, NULL, shader_prog, NULL, NULL)
{
}
};
void register_coalesce_test::SetUp()
{
brw = (struct brw_context *)calloc(1, sizeof(*brw));
@ -53,7 +66,7 @@ void register_coalesce_test::SetUp()
shader_prog = ralloc(NULL, struct gl_shader_program);
v = new vec4_visitor(brw, c, NULL, shader_prog, NULL, NULL);
v = new register_coalesce_vec4_visitor(brw, c, shader_prog);
_mesa_init_vertex_program(ctx, &c->vp->program, GL_VERTEX_SHADER, 0);