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

r600/sfn: Fix splitting constants that come from different kcache banks.

Browse Source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5085>
This commit is contained in:
Gert Wollny
2020-05-16 20:39:45 +02:00
committed by Marge Bot
parent 723ae8177e
commit 9f942a8e7c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/r600/sfn/sfn_emitaluinstruction.cpp
View File

@@ -191,13 +191,13 @@ void EmitAluInstruction::split_constants(const nir_alu_instr& instr)
return;
int nconst = 0;
std::array<PValue,4> c;
std::array<const UniformValue *,4> c;
std::array<int,4> idx;
for (unsigned i = 0; i < op_info->num_inputs; ++i) {
PValue src = from_nir(instr.src[i], 0);
assert(src);
if (src->type() == Value::kconst) {
c[nconst] = src;
c[nconst] = static_cast<const UniformValue *>(src.get());
idx[nconst++] = i;
}
@@ -206,11 +206,12 @@ void EmitAluInstruction::split_constants(const nir_alu_instr& instr)
return;
unsigned sel = c[0]->sel();
unsigned kcache = c[0]->kcache_bank();
sfn_log << SfnLog::reg << "split " << nconst << " constants, sel[0] = " << sel; ;
for (int i = 1; i < nconst; ++i) {
sfn_log << "sel[" << i << "] = " << c[i]->sel() << "\n";
if (c[i]->sel() != sel) {
if (c[i]->sel() != sel || c[i]->kcache_bank() != kcache) {
load_uniform(instr.src[idx[i]]);
}
}