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

gallium/tgsi_exec: Fix up NumOutputs counting

Browse source 
We can get duplicate declarations for an index (for example dvec3 + float
packed into 2 vec4s, the second one won't pack into the first's array
decl), and we'd end up stepping by the wrong amount in GS vtx/prim emit.

Fixes vs-gs-fs-double, sso-vs-gs-fs-array-interleave piglit tests.

Fixes: 49155c3264 ("draw/tgsi: fix geometry shader input/output swizzling")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6567>
(cherry picked from commit 329dee1455)
This commit is contained in:
Eric Anholt 2020-08-25 16:01:47 -07:00 • committed by Eric Engestrom
parent 2f6cd0afa2
commit 022c22d1cb
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3577,7 +3577,7 @@
"description": "gallium/tgsi_exec: Fix up NumOutputs counting",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "49155c3264d019869fadde50ff6167a369e966b6"
},

10
src/gallium/auxiliary/tgsi/tgsi_exec.c
View file

@ -1181,14 +1181,8 @@ tgsi_exec_machine_bind_shader(
* sizeof(struct tgsi_full_declaration));
maxDeclarations += 10;
}
if (parse.FullToken.FullDeclaration.Declaration.File == TGSI_FILE_OUTPUT) {
unsigned reg;
for (reg = parse.FullToken.FullDeclaration.Range.First;
reg <= parse.FullToken.FullDeclaration.Range.Last;
++reg) {
++mach->NumOutputs;
}
}
if (parse.FullToken.FullDeclaration.Declaration.File == TGSI_FILE_OUTPUT)
mach->NumOutputs = MAX2(mach->NumOutputs, parse.FullToken.FullDeclaration.Range.Last + 1);
else if (parse.FullToken.FullDeclaration.Declaration.File == TGSI_FILE_SYSTEM_VALUE) {
const struct tgsi_full_declaration *decl = &parse.FullToken.FullDeclaration;
mach->SysSemanticToIndex[decl->Semantic.Name] = decl->Range.First;