=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Validate resource flags.
Alexandre Julliard
julliard at winehq.org
Mon May 6 15:33:45 CDT 2019
Module: vkd3d
Branch: master
Commit: a2f7ae0d3243469f6f44c366c1580ade15e6b85e
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a2f7ae0d3243469f6f44c366c1580ade15e6b85e
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon May 6 14:47:38 2019 +0200
vkd3d: Validate resource flags.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/resource.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 36e470b..aba850f 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -549,6 +549,9 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device,
buffer_info.pQueueFamilyIndices = NULL;
}
+ if (desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL))
+ FIXME("Unsupported resource flags %#x.\n", desc->Flags);
+
if ((vr = VK_CALL(vkCreateBuffer(device->vk_device, &buffer_info, NULL, vk_buffer))) < 0)
{
WARN("Failed to create Vulkan buffer, vr %d.\n", vr);
@@ -672,6 +675,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device,
HRESULT hr;
assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER);
+ assert(d3d12_resource_validate_desc(desc) == S_OK);
if (!desc->MipLevels)
{
@@ -1190,6 +1194,22 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface)
return impl_from_ID3D12Resource(iface);
}
+static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags)
+{
+ unsigned int unknown_flags = flags & ~(D3D12_RESOURCE_FLAG_NONE
+ | D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET
+ | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL
+ | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS
+ | D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE
+ | D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER
+ | D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+
+ if (unknown_flags)
+ FIXME("Unknown resource flags %#x.\n", unknown_flags);
+ if (flags & D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER)
+ FIXME("Ignoring D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER.\n");
+}
+
HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc)
{
switch (desc->Dimension)
@@ -1228,6 +1248,8 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc)
return E_INVALIDARG;
}
+ d3d12_validate_resource_flags(desc->Flags);
+
/* FIXME: Validate alignment for textures. */
return S_OK;
More information about the wine-cvs
mailing list