diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-04-30 17:01:33 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-01 00:27:23 +0000 |
| commit | 6148d1be4bb52039ccda57f25a9d27ecb7aa7541 (patch) | |
| tree | aaa36cb81279a92115860859857ba37d8d513b5c /src/panfrost | |
| parent | 884f8699925b51f7032b4cd0e8d6ef1a8d48bc8c (diff) | |
panfrost: Fix size of bifrost sampler descriptor
Should be 32-bytes, it looks like.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4844>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/include/panfrost-job.h | 7 | ||||
| -rw-r--r-- | src/panfrost/pandecode/decode.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index 051fe27a5af..0a2afc32685 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -1361,11 +1361,10 @@ struct bifrost_sampler_descriptor { int16_t min_lod; int16_t max_lod; - int8_t zero2; - int8_t zero3; - uint32_t zero4; - uint32_t zero5; + uint64_t zero2; + uint64_t zero3; + uint64_t zero4; } __attribute__((packed)); /* viewport0/viewport1 form the arguments to glViewport. viewport1 is diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c index a76cb58b38c..cc48b9d133f 100644 --- a/src/panfrost/pandecode/decode.c +++ b/src/panfrost/pandecode/decode.c @@ -2441,9 +2441,9 @@ pandecode_samplers(mali_ptr samplers, unsigned sampler_count, int job_no, bool i pandecode_prop("min_lod = FIXED_16(%f)", DECODE_FIXED_16(s->min_lod)); pandecode_prop("max_lod = FIXED_16(%f)", DECODE_FIXED_16(s->max_lod)); - if (s->zero1 || s->zero2 || s->zero3 || s->zero4 || s->zero5) { + if (s->zero1 || s->zero2 || s->zero3 || s->zero4) { pandecode_msg("XXX: sampler zero tripped\n"); - pandecode_prop("zero = 0x%X, 0x%X, 0x%X, 0x%X, 0x%X\n", s->zero1, s->zero2, s->zero3, s->zero4, s->zero5); + pandecode_prop("zero = 0x" PRIx64 ", 0x" PRIx64 ", 0x" PRIx64 ", 0x" PRIx64 "\n", s->zero1, s->zero2, s->zero3, s->zero4); } pandecode_indent--; |