fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 12:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/vs: Avoid allocating registers in to the gen7 MRF hack region.

Browse source 
This is the corresponding fix to the previous one for the FS, but I
don't have a particular test for it.

NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 9195191e50)
This commit is contained in:
Eric Anholt 2012-01-27 12:59:24 -08:00 • committed by Ian Romanick
parent 20da01fecd
commit 1b5e151ffa
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_vec4.h
View file

@ -334,6 +334,7 @@ public:
int virtual_grf_count;
int virtual_grf_array_size;
int first_non_payload_grf;
unsigned int max_grf;
int *virtual_grf_def;
int *virtual_grf_use;
dst_reg userplane[MAX_CLIP_PLANES];

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

@ -87,9 +87,9 @@ vec4_visitor::reg_allocate_trivial()
assign(hw_reg_mapping, &inst->src[2]);
}
if (prog_data->total_grf > BRW_MAX_GRF) {
if (prog_data->total_grf > max_grf) {
fail("Ran out of regs on trivial allocator (%d/%d)\n",
prog_data->total_grf, BRW_MAX_GRF);
prog_data->total_grf, max_grf);
}
}
@ -144,7 +144,7 @@ vec4_visitor::reg_allocate()
{
int hw_reg_mapping[virtual_grf_count];
int first_assigned_grf = this->first_non_payload_grf;
int base_reg_count = BRW_MAX_GRF - first_assigned_grf;
int base_reg_count = max_grf - first_assigned_grf;
int class_sizes[base_reg_count];
int class_count = 0;

2
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -2601,6 +2601,8 @@ vec4_visitor::vec4_visitor(struct brw_vs_compile *c,
this->virtual_grf_array_size = 0;
this->live_intervals_valid = false;
this->max_grf = intel->gen >= 7 ? GEN7_MRF_HACK_START : BRW_MAX_GRF;
this->uniforms = 0;
}