fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau/codegen: Fix compact patch varyings in case of NIR

Browse source 
The code path was not implemented and an assert was reached.

Reviewed-by: M Henning <drawoc@darkrefraction.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24327>
This commit is contained in:
George Ouzounoudis 2023-04-14 15:14:37 +03:00 • committed by Marge Bot
parent b96639011c
commit df5d1ef2b5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nouveau/codegen/nv50_ir_from_nir.cpp
View file

@ -997,7 +997,6 @@ bool Converter::assignSlots() {
}
if (var->data.compact) {
assert(!var->data.patch);
assert(!(nir->info.outputs_read & 1ull << slot));
if (nir_is_arrayed_io(var, nir->info.stage)) {
assert(glsl_type_is_array(type->fields.array));
@ -1015,6 +1014,7 @@ bool Converter::assignSlots() {
if (comps & 0x0f) {
nv50_ir_varying *v = &info_out->in[vary];
v->patch = var->data.patch;
v->sn = name;
v->si = index;
v->mask |= comps & 0x0f;
@ -1023,6 +1023,7 @@ bool Converter::assignSlots() {
}
if (comps & 0xf0) {
nv50_ir_varying *v = &info_out->in[vary + 1];
v->patch = var->data.patch;
v->sn = name;
v->si = index + 1;
v->mask |= (comps & 0xf0) >> 4;
@ -1110,7 +1111,6 @@ bool Converter::assignSlots() {
}
if (var->data.compact) {
assert(!var->data.patch);
assert(!(nir->info.outputs_read & 1ull << slot));
if (nir_is_arrayed_io(var, nir->info.stage)) {
assert(glsl_type_is_array(type->fields.array));
@ -1128,6 +1128,7 @@ bool Converter::assignSlots() {
if (comps & 0x0f) {
nv50_ir_varying *v = &info_out->out[vary];
v->patch = var->data.patch;
v->sn = name;
v->si = index;
v->mask |= comps & 0x0f;
@ -1136,6 +1137,7 @@ bool Converter::assignSlots() {
}
if (comps & 0xf0) {
nv50_ir_varying *v = &info_out->out[vary + 1];
v->patch = var->data.patch;
v->sn = name;
v->si = index + 1;
v->mask |= (comps & 0xf0) >> 4;