KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pan/decode: Fix image attribute counting 

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11123>
This commit is contained in:
Alyssa Rosenzweig 2021-06-02 15:42:05 -04:00 committed by Marge Bot
parent 1cc3f8cb64
commit 866c22bff5
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/panfrost/lib/decode.c
View File

@ -388,7 +388,7 @@ pandecode_attributes(const struct pandecode_mapped_memory *mem,
ATTRIBUTE_BUFFER_CONTINUATION_NPOT, temp2); ATTRIBUTE_BUFFER_CONTINUATION_NPOT, temp2);
pan_print(pandecode_dump_stream, ATTRIBUTE_BUFFER_CONTINUATION_NPOT, pan_print(pandecode_dump_stream, ATTRIBUTE_BUFFER_CONTINUATION_NPOT,
temp2, (pandecode_indent + 1) * 2); temp2, (pandecode_indent + 1) * 2);
i++; count++; i++;
break; break;
} }
case MALI_ATTRIBUTE_TYPE_3D_LINEAR: case MALI_ATTRIBUTE_TYPE_3D_LINEAR:
@ -397,7 +397,7 @@ pandecode_attributes(const struct pandecode_mapped_memory *mem,
ATTRIBUTE_BUFFER_CONTINUATION_3D, temp2); ATTRIBUTE_BUFFER_CONTINUATION_3D, temp2);
pan_print(pandecode_dump_stream, ATTRIBUTE_BUFFER_CONTINUATION_3D, pan_print(pandecode_dump_stream, ATTRIBUTE_BUFFER_CONTINUATION_3D,
temp2, (pandecode_indent + 1) * 2); temp2, (pandecode_indent + 1) * 2);
i++; count++; i++;
break; break;
} }
default: default:
@ -428,19 +428,20 @@ pandecode_midgard_blend_mrt(void *descs, int job_no, int rt_no)
return b.midgard.blend_shader ? (b.midgard.shader_pc & ~0xf) : 0; return b.midgard.blend_shader ? (b.midgard.shader_pc & ~0xf) : 0;
} }
/* Attributes and varyings have descriptor records, which contain information static unsigned
* about their format and ordering with the attribute/varying buffers. We'll pandecode_attribute_meta(int count, mali_ptr attribute, bool varying)
* want to validate that the combinations specified are self-consistent.
*/
static int
pandecode_attribute_meta(int count, mali_ptr attribute, bool varying, char *suffix)
{ {
for (int i = 0; i < count; ++i, attribute += MALI_ATTRIBUTE_LENGTH) unsigned max = 0;
DUMP_ADDR(ATTRIBUTE, attribute, "%s:\n", varying ? "Varying" : "Attribute");
for (int i = 0; i < count; ++i, attribute += MALI_ATTRIBUTE_LENGTH) {
MAP_ADDR(ATTRIBUTE, attribute, cl);
pan_unpack(cl, ATTRIBUTE, a);
DUMP_UNPACKED(ATTRIBUTE, a, "%s:\n", varying ? "Varying" : "Attribute");
max = MAX2(max, a.buffer_index);
}
pandecode_log("\n"); pandecode_log("\n");
return count; return MIN2(max + 1, 256);
} }
/* return bits [lo, hi) of word */ /* return bits [lo, hi) of word */
@ -872,7 +873,7 @@ pandecode_dcd(const struct MALI_DRAW *p,
unsigned max_attr_index = 0; unsigned max_attr_index = 0;
if (p->attributes) if (p->attributes)
max_attr_index = pandecode_attribute_meta(attribute_count, p->attributes, false, suffix); max_attr_index = pandecode_attribute_meta(attribute_count, p->attributes, false);
if (p->attribute_buffers) { if (p->attribute_buffers) {
attr_mem = pandecode_find_mapped_gpu_mem_containing(p->attribute_buffers); attr_mem = pandecode_find_mapped_gpu_mem_containing(p->attribute_buffers);
@ -880,7 +881,7 @@ pandecode_dcd(const struct MALI_DRAW *p,
} }
if (p->varyings) { if (p->varyings) {
varying_count = pandecode_attribute_meta(varying_count, p->varyings, true, suffix); varying_count = pandecode_attribute_meta(varying_count, p->varyings, true);
} }
if (p->varying_buffers) { if (p->varying_buffers) {