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

d3d12: Fix up resource import validation

Browse Source 
Format on buffers is irrelevant and bind flag validation needs to be disabled.

Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17446>
This commit is contained in:
Jesse Natalie
2022-07-11 15:55:35 -07:00
committed by Marge Bot
parent d119e6a46f
commit 333432310a
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gallium/drivers/d3d12/d3d12_resource.cpp
View File

@@ -568,25 +568,31 @@ d3d12_resource_from_handle(struct pipe_screen *pscreen,
res->base.b.last_level + 1, templ->last_level + 1); res->base.b.last_level + 1, templ->last_level + 1);
goto invalid; goto invalid;
} }
if ((footprint->Format != d3d12_get_format(templ->format) && if (templ->target != PIPE_BUFFER) {
footprint->Format != d3d12_get_typeless_format(templ->format)) || if ((footprint->Format != d3d12_get_format(templ->format) &&
(incoming_res_desc.Format != d3d12_get_format((enum pipe_format)handle->format) && footprint->Format != d3d12_get_typeless_format(templ->format)) ||
incoming_res_desc.Format != d3d12_get_typeless_format((enum pipe_format)handle->format))) { (incoming_res_desc.Format != d3d12_get_format((enum pipe_format)handle->format) &&
debug_printf("d3d12: Importing resource with mismatched format: " incoming_res_desc.Format != d3d12_get_typeless_format((enum pipe_format)handle->format))) {
"plane could be DXGI format %d or %d, but is %d, " debug_printf("d3d12: Importing resource with mismatched format: "
"overall could be DXGI format %d or %d, but is %d\n", "plane could be DXGI format %d or %d, but is %d, "
d3d12_get_format(templ->format), "overall could be DXGI format %d or %d, but is %d\n",
d3d12_get_typeless_format(templ->format), d3d12_get_format(templ->format),
footprint->Format, d3d12_get_typeless_format(templ->format),
d3d12_get_format((enum pipe_format)handle->format), footprint->Format,
d3d12_get_typeless_format((enum pipe_format)handle->format), d3d12_get_format((enum pipe_format)handle->format),
incoming_res_desc.Format); d3d12_get_typeless_format((enum pipe_format)handle->format),
goto invalid; incoming_res_desc.Format);
goto invalid;
}
} }
/* In an ideal world we'd be able to validate this, but gallium's use of bind
* flags during resource creation is pretty bad: some bind flags are always set
* (like PIPE_BIND_RENDER_TARGET) while others are never set (PIPE_BIND_SHADER_BUFFER)
*
if (templ->bind & ~res->base.b.bind) { if (templ->bind & ~res->base.b.bind) {
debug_printf("d3d12: Imported resource doesn't have necessary bind flags\n"); debug_printf("d3d12: Imported resource doesn't have necessary bind flags\n");
goto invalid; goto invalid;
} } */
res->base.b.format = templ->format; res->base.b.format = templ->format;
res->overall_format = (enum pipe_format)handle->format; res->overall_format = (enum pipe_format)handle->format;