KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: pre-filter multi-plane modifiers 

only single plane modifiers are supported now

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12857>
This commit is contained in:
Mike Blumenkrantz 2021-09-14 13:44:58 -04:00
parent cfe0bf5a4a
commit 4e6d78c3b0
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/drivers/zink/zink_resource.c
View File

@ -730,6 +730,17 @@ resource_create(struct pipe_screen *pscreen,
FREE(res);
return NULL;
}
/* TODO: remove this when multi-plane modifiers are supported */
const struct zink_modifier_prop *prop = &screen->modifier_props[templ->format];
for (unsigned i = 0; i < modifiers_count; i++) {
for (unsigned j = 0; j < prop->drmFormatModifierCount; j++) {
if (prop->pDrmFormatModifierProperties[j].drmFormatModifier == modifiers[i]) {
if (prop->pDrmFormatModifierProperties[j].drmFormatModifierPlaneCount != 1)
res->modifiers[i] = DRM_FORMAT_MOD_INVALID;
break;
}
}
}
}
res->base.b = *templ;
@ -743,7 +754,7 @@ resource_create(struct pipe_screen *pscreen,
unsigned scanout_flags = templ->bind & (PIPE_BIND_SCANOUT | PIPE_BIND_SHARED);
if (!(templ->bind & PIPE_BIND_LINEAR))
templ2.bind &= ~scanout_flags;
res->obj = resource_object_create(screen, &templ2, whandle, &optimal_tiling, modifiers, 0);
res->obj = resource_object_create(screen, &templ2, whandle, &optimal_tiling, NULL, 0);
if (!res->obj) {
free(res->modifiers);
FREE(res);
@ -773,7 +784,7 @@ resource_create(struct pipe_screen *pscreen,
// TODO: remove for wsi
templ2 = res->base.b;
templ2.bind = scanout_flags | PIPE_BIND_LINEAR;
res->scanout_obj = resource_object_create(screen, &templ2, whandle, &optimal_tiling, modifiers, modifiers_count);
res->scanout_obj = resource_object_create(screen, &templ2, whandle, &optimal_tiling, res->modifiers, res->modifiers_count);
assert(!optimal_tiling);
}
}