OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Fix size of bifrost sampler descriptor

Browse Source 
Should be 32-bytes, it looks like.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4844>
This commit is contained in:
Alyssa Rosenzweig
2020-04-30 17:01:33 -04:00
committed by Marge Bot
parent 884f869992
commit 6148d1be4b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/panfrost/include/panfrost-job.h
View File

@@ -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

4
src/panfrost/pandecode/decode.c
View File

@@ -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--;