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

freedreno/rnn: headergen2 warnings cleanup

Browse Source 
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6118>
This commit is contained in:
Rob Clark
2020-07-29 11:25:13 -07:00
committed by Marge Bot
parent 128cbcd3a7
commit 20e703b7e6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/freedreno/rnn/headergen2.c
View File

@@ -179,11 +179,11 @@ static void printtypeinfo (struct rnntypeinfo *ti, struct rnnbitfield *bf,
if ((ti->minvalid || ti->maxvalid || ti->alignvalid) && !no_asserts) { if ((ti->minvalid || ti->maxvalid || ti->alignvalid) && !no_asserts) {
fprintf(dst, "\tassert(1"); fprintf(dst, "\tassert(1");
if (ti->minvalid) if (ti->minvalid)
fprintf(dst, " && (val >= %lu)", ti->min); fprintf(dst, " && (val >= %"PRIu64")", ti->min);
if (ti->maxvalid) if (ti->maxvalid)
fprintf(dst, " && (val <= %lu)", ti->max); fprintf(dst, " && (val <= %"PRIu64")", ti->max);
if (ti->alignvalid) if (ti->alignvalid)
fprintf(dst, " && !(val %% %lu)", ti->align); fprintf(dst, " && !(val %% %"PRIu64")", ti->align);
fprintf(dst, ");\n"); fprintf(dst, ");\n");
} }
@@ -289,7 +289,7 @@ static void printdelem (struct rnndelem *elem, uint64_t offset) {
fprintf(dst, "%d", i); fprintf(dst, "%d", i);
} }
if (elem->offsets) { if (elem->offsets) {
fprintf(dst, ": return 0x%08lx;\n", elem->offsets[i]); fprintf(dst, ": return 0x%08"PRIx64";\n", elem->offsets[i]);
} else { } else {
fprintf(dst, ": return (%s);\n", elem->doffsets[i]); fprintf(dst, ": return (%s);\n", elem->doffsets[i]);
} }
@@ -470,10 +470,10 @@ int main(int argc, char **argv) {
fprintf(dst, "enum %s {\n", db->enums[i]->name); fprintf(dst, "enum %s {\n", db->enums[i]->name);
} }
if (0xffff0000 & db->enums[i]->vals[j]->value) if (0xffff0000 & db->enums[i]->vals[j]->value)
fprintf(dst, "\t%s = 0x%08lx,\n", db->enums[i]->vals[j]->name, fprintf(dst, "\t%s = 0x%08"PRIx64",\n", db->enums[i]->vals[j]->name,
db->enums[i]->vals[j]->value); db->enums[i]->vals[j]->value);
else else
fprintf(dst, "\t%s = %lu,\n", db->enums[i]->vals[j]->name, fprintf(dst, "\t%s = %"PRIu64",\n", db->enums[i]->vals[j]->name,
db->enums[i]->vals[j]->value); db->enums[i]->vals[j]->value);
} }
if (dst) { if (dst) {