i965/vs: split brw_vs_compile into generic and VS-specific parts.

This will allow the generic parts to be re-used for geometry shaders.

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:33:31 -08:00
parent 09cd6e06d2
commit d7af636473
4 changed files with 13 additions and 9 deletions

View file

@ -321,7 +321,7 @@ void
vec4_visitor::spill_reg(int spill_reg_nr)
{
assert(virtual_grf_sizes[spill_reg_nr] == 1);
unsigned int spill_offset = c->last_scratch++;
unsigned int spill_offset = c->base.last_scratch++;
/* Generate spill/unspill instructions for the objects being spilled. */
foreach_list(node, &this->instructions) {

View file

@ -2819,8 +2819,8 @@ vec4_visitor::move_grf_array_access_to_scratch()
if (inst->dst.file == GRF && inst->dst.reladdr &&
scratch_loc[inst->dst.reg] == -1) {
scratch_loc[inst->dst.reg] = c->last_scratch;
c->last_scratch += this->virtual_grf_sizes[inst->dst.reg];
scratch_loc[inst->dst.reg] = c->base.last_scratch;
c->base.last_scratch += this->virtual_grf_sizes[inst->dst.reg];
}
for (int i = 0 ; i < 3; i++) {
@ -2828,8 +2828,8 @@ vec4_visitor::move_grf_array_access_to_scratch()
if (src->file == GRF && src->reladdr &&
scratch_loc[src->reg] == -1) {
scratch_loc[src->reg] = c->last_scratch;
c->last_scratch += this->virtual_grf_sizes[src->reg];
scratch_loc[src->reg] = c->base.last_scratch;
c->base.last_scratch += this->virtual_grf_sizes[src->reg];
}
}
}

View file

@ -312,12 +312,12 @@ do_vs_prog(struct brw_context *brw,
}
/* Scratch space is used for register spilling */
if (c.last_scratch) {
if (c.base.last_scratch) {
perf_debug("Vertex shader triggered register spilling. "
"Try reducing the number of live vec4 values to "
"improve performance.\n");
prog_data.total_scratch = brw_get_scratch_size(c.last_scratch*REG_SIZE);
prog_data.total_scratch = brw_get_scratch_size(c.base.last_scratch*REG_SIZE);
brw_get_scratch_bo(intel, &brw->vs.scratch_bo,
prog_data.total_scratch * brw->max_vs_threads);

View file

@ -103,12 +103,16 @@ struct brw_vs_prog_key {
};
struct brw_vec4_compile {
GLuint last_scratch; /**< measured in 32-byte (register size) units */
};
struct brw_vs_compile {
struct brw_vec4_compile base;
struct brw_vs_prog_key key;
struct brw_vertex_program *vp;
GLuint last_scratch; /**< measured in 32-byte (register size) units */
};
const unsigned *brw_vs_emit(struct brw_context *brw,