OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600g/sb: fix allocation of indirectly addressed input arrays

Browse Source 
Some inputs may be preloaded into predefined GPRs,
so we can't reallocate arrays with such inputs.

Fixes issues with webgl demo: http://oos.moxiecode.com/js_webgl/snake/

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
This commit is contained in:
Vadim Girlin
2013-05-02 07:56:32 +04:00
parent a6fe055fa7
commit e16ef1f454
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gallium/drivers/r600/sb/sb_shader.cpp
View File

@@ -61,7 +61,7 @@ bool shader::assign_slot(alu_node* n, alu_node *slots[5]) {
return true;
}
void shader::add_gpr_values(vvec& vec, unsigned gpr, unsigned comp_mask,
void shader::add_pinned_gpr_values(vvec& vec, unsigned gpr, unsigned comp_mask,
bool src) {
unsigned chan = 0;
while (comp_mask) {
@@ -72,6 +72,11 @@ void shader::add_gpr_values(vvec& vec, unsigned gpr, unsigned comp_mask,
v->gpr = v->pin_gpr = v->select;
v->fix();
}
if (v->array && !v->array->gpr) {
// if pinned value can be accessed with indirect addressing
// pin the entire array to its original location
v->array->gpr = v->array->base_gpr;
}
vec.push_back(v);
}
comp_mask >>= 1;
@@ -199,7 +204,7 @@ void shader::add_input(unsigned gpr, bool preloaded, unsigned comp_mask) {
i.comp_mask = comp_mask;
if (preloaded) {
add_gpr_values(root->dst, gpr, comp_mask, true);
add_pinned_gpr_values(root->dst, gpr, comp_mask, true);
}
}
@@ -217,9 +222,9 @@ void shader::init_call_fs(cf_node* cf) {
for(inputs_vec::const_iterator I = inputs.begin(),
E = inputs.end(); I != E; ++I, ++gpr) {
if (!I->preloaded)
add_gpr_values(cf->dst, gpr, I->comp_mask, false);
add_pinned_gpr_values(cf->dst, gpr, I->comp_mask, false);
else
add_gpr_values(cf->src, gpr, I->comp_mask, true);
add_pinned_gpr_values(cf->src, gpr, I->comp_mask, true);
}
}