fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 09:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/decode: Handle special varyings

Browse source 
We need a special path for special varyings so we parse them correctly
instead of throwing an error when they inevitably point to bad memory.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-08-22 13:27:38 -07:00
parent caec0b3232
commit f4678f3c62
1 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/panfrost/pandecode/decode.c
View file

@ -413,7 +413,6 @@ pandecode_stencil_op(enum mali_stencil_op op)
#undef DEFINE_CASE
#define DEFINE_CASE(name) case MALI_ATTR_ ## name: return "MALI_ATTR_" #name
static char *pandecode_attr_mode_short(enum mali_attr_mode mode)
{
switch(mode) {
@ -435,7 +434,21 @@ static char *pandecode_attr_mode_short(enum mali_attr_mode mode)
}
}
#undef DEFINE_CASE
static const char *
pandecode_special_varying(uint64_t v)
{
switch(v) {
case MALI_VARYING_FRAG_COORD:
return "gl_FragCoord";
case MALI_VARYING_FRONT_FACING:
return "gl_FrontFacing";
case MALI_VARYING_POINT_COORD:
return "gl_PointCoord";
default:
pandecode_msg("XXX: invalid special varying %X\n", v);
return "";
}
}
#define DEFINE_CASE(name) case MALI_WRAP_## name: return "MALI_WRAP_" #name
static char *
@ -1248,7 +1261,7 @@ pandecode_magic_divisor(uint32_t magic, unsigned shift, unsigned orig_divisor, u
static void
pandecode_attributes(const struct pandecode_mapped_memory *mem,
mali_ptr addr, int job_no, char *suffix,
int count, bool varying)
int count, bool varying, enum mali_job_type job_type)
{
char *prefix = varying ? "varying" : "attribute";
assert(addr);
@ -1261,6 +1274,29 @@ pandecode_attributes(const struct pandecode_mapped_memory *mem,
union mali_attr *attr = pandecode_fetch_gpu_mem(mem, addr, sizeof(union mali_attr) * count);
for (int i = 0; i < count; ++i) {
/* First, check for special records */
if (attr[i].elements < MALI_VARYING_SPECIAL) {
/* Special records are always varyings */
if (!varying)
pandecode_msg("XXX: Special varying in attribute field\n");
if (job_type != JOB_TYPE_TILER)
pandecode_msg("XXX: Special varying in non-FS\n");
/* We're special, so all fields should be zero */
unsigned zero = attr[i].stride | attr[i].size;
zero |= attr[i].shift | attr[i].extra_flags;
if (zero)
pandecode_msg("XXX: Special varying has non-zero fields\n");
else {
/* Print the special varying name */
pandecode_log("varying_%d = %s;", i, pandecode_special_varying(attr[i].elements));
continue;
}
}
enum mali_attr_mode mode = attr[i].elements & 7;
if (mode == MALI_ATTR_UNUSED)
@ -2225,7 +2261,7 @@ pandecode_vertex_tiler_postfix_pre(
if (p->attributes) {
attr_mem = pandecode_find_mapped_gpu_mem_containing(p->attributes);
pandecode_attributes(attr_mem, p->attributes, job_no, suffix, max_attr_index, false);
pandecode_attributes(attr_mem, p->attributes, job_no, suffix, max_attr_index, false, job_type);
}
/* Varyings are encoded like attributes but not actually sent; we just
@ -2242,7 +2278,7 @@ pandecode_vertex_tiler_postfix_pre(
/* Number of descriptors depends on whether there are
* non-internal varyings */
pandecode_attributes(attr_mem, p->varyings, job_no, suffix, varying_count, true);
pandecode_attributes(attr_mem, p->varyings, job_no, suffix, varying_count, true, job_type);
}
if (p->uniform_buffers) {