fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: add fallback for linear modifier use

Browse source 
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10782>
This commit is contained in:
Mike Blumenkrantz 2021-06-22 08:33:04 -04:00 • committed by Marge Bot
parent 02593a05e2
commit 452ffddbff
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/drivers/zink/zink_resource.c
View file

@ -323,6 +323,18 @@ get_image_usage_for_feats(struct zink_screen *screen, VkFormatFeatureFlags feats
return usage;
}
static VkFormatFeatureFlags
find_modifier_feats(const struct zink_modifier_prop *prop, uint64_t modifier, uint64_t *mod)
{
for (unsigned j = 0; j < prop->drmFormatModifierCount; j++) {
if (prop->pDrmFormatModifierProperties[j].drmFormatModifier == modifier) {
*mod = modifier;
return prop->pDrmFormatModifierProperties[j].drmFormatModifierTilingFeatures;
}
}
return 0;
}
static VkImageUsageFlags
get_image_usage(struct zink_screen *screen, VkImageCreateInfo *ici, const struct pipe_resource *templ, unsigned bind, unsigned modifiers_count, const uint64_t *modifiers, uint64_t *mod)
{
@ -330,19 +342,27 @@ get_image_usage(struct zink_screen *screen, VkImageCreateInfo *ici, const struct
#ifdef ZINK_USE_DMABUF
*mod = DRM_FORMAT_MOD_INVALID;
if (modifiers_count) {
bool have_linear = false;
const struct zink_modifier_prop *prop = &screen->modifier_props[templ->format];
assert(tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT);
for (unsigned i = 0; i < modifiers_count; i++) {
if (modifiers[i] == DRM_FORMAT_MOD_LINEAR)
if (modifiers[i] == DRM_FORMAT_MOD_LINEAR) {
have_linear = true;
continue;
VkFormatFeatureFlags feats = 0;
struct zink_modifier_prop *prop = &screen->modifier_props[templ->format];
for (unsigned j = 0; j < prop->drmFormatModifierCount; j++) {
if (prop->pDrmFormatModifierProperties[j].drmFormatModifier == modifiers[i]) {
feats = prop->pDrmFormatModifierProperties[j].drmFormatModifierTilingFeatures;
*mod = modifiers[i];
break;
}
VkFormatFeatureFlags feats = find_modifier_feats(prop, modifiers[i], mod);
if (feats) {
VkImageUsageFlags usage = get_image_usage_for_feats(screen, feats, templ, bind);
if (usage) {
ici->usage = usage;
if (check_ici(screen, ici, *mod))
return usage;
}
}
}
/* only try linear if no other options available */
if (have_linear) {
VkFormatFeatureFlags feats = find_modifier_feats(prop, DRM_FORMAT_MOD_LINEAR, mod);
if (feats) {
VkImageUsageFlags usage = get_image_usage_for_feats(screen, feats, templ, bind);
if (usage) {