wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Avoid printing FIXME() about error blobs unnecessarily.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-02-06 12:38:06 +01:00 committed by Alexandre Julliard
parent 0641229e0e
commit ffbe7e7191
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/vkd3d/vkd3d_main.c
View File

@ -343,16 +343,15 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig
} }
if (error_blob) if (error_blob)
{
FIXME("Ignoring error blob %p.\n", error_blob);
*error_blob = NULL; *error_blob = NULL;
}
if ((ret = vkd3d_shader_serialize_root_signature( if ((ret = vkd3d_shader_serialize_root_signature(
(const struct vkd3d_root_signature_desc *)root_signature_desc, (const struct vkd3d_root_signature_desc *)root_signature_desc,
(enum vkd3d_root_signature_version)version, &dxbc)) < 0) (enum vkd3d_root_signature_version)version, &dxbc)) < 0)
{ {
WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); WARN("Failed to serialize root signature, vkd3d result %d.\n", ret);
if (error_blob)
FIXME("Ignoring error blob %p.\n", error_blob);
return hresult_from_vkd3d_result(ret); return hresult_from_vkd3d_result(ret);
} }

6
tests/d3d12.c
View File

@ -9728,14 +9728,16 @@ static void test_root_signature_deserialization_(unsigned int line, const DWORD
static void test_root_signature_serialization_(unsigned int line, const DWORD *code, size_t code_size, static void test_root_signature_serialization_(unsigned int line, const DWORD *code, size_t code_size,
const D3D12_ROOT_SIGNATURE_DESC *desc) const D3D12_ROOT_SIGNATURE_DESC *desc)
{ {
ID3DBlob *blob, *error_blob;
DWORD *blob_buffer; DWORD *blob_buffer;
size_t blob_size; size_t blob_size;
ID3DBlob *blob;
unsigned int i; unsigned int i;
HRESULT hr; HRESULT hr;
hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, NULL); error_blob = (ID3DBlob *)0xdeadbeef;
hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, &error_blob);
ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr); ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr);
ok_(line)(!error_blob, "Got unexpected error blob %p.\n", error_blob);
blob_buffer = ID3D10Blob_GetBufferPointer(blob); blob_buffer = ID3D10Blob_GetBufferPointer(blob);
blob_size = ID3D10Blob_GetBufferSize(blob); blob_size = ID3D10Blob_GetBufferSize(blob);