aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/panfrost/include/panfrost-job.h7
-rw-r--r--src/panfrost/pandecode/decode.c4
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--;