zink: handle modifier nplanes queries correctly for planar formats

this just returns the number of planes in the base format as a default, which
matches the behavior of other drivers

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20753>
(cherry picked from commit 6ff334e54a)
This commit is contained in:
Mike Blumenkrantz 2023-01-17 14:45:48 -05:00 committed by Dylan Baker
parent d965740df1
commit 34055e7822
2 changed files with 2 additions and 2 deletions

View file

@ -211,7 +211,7 @@
"description": "zink: handle modifier nplanes queries correctly for planar formats",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -2104,7 +2104,7 @@ zink_get_dmabuf_modifier_planes(struct pipe_screen *pscreen, uint64_t modifier,
for (unsigned i = 0; i < screen->modifier_props[format].drmFormatModifierCount; i++)
if (screen->modifier_props[format].pDrmFormatModifierProperties[i].drmFormatModifier == modifier)
return screen->modifier_props[format].pDrmFormatModifierProperties[i].drmFormatModifierPlaneCount;
return 0;
return util_format_get_num_planes(format);
}
static int