wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-utils: Simplify handling of shader messages a bit.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-03-06 20:04:35 -06:00 committed by Alexandre Julliard
parent e9fd9a79a1
commit fc5df4d330
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/vkd3d-utils/vkd3d_utils_main.c
View File

@ -263,20 +263,18 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen
} }
ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages);
if (messages)
if (messages && messages_blob)
{ {
if (messages_blob) if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob)))
{ {
if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob)))
{
vkd3d_shader_free_messages(messages);
vkd3d_shader_free_shader_code(&byte_code);
return hr;
}
}
else
vkd3d_shader_free_messages(messages); vkd3d_shader_free_messages(messages);
vkd3d_shader_free_shader_code(&byte_code);
return hr;
}
messages = NULL;
} }
vkd3d_shader_free_messages(messages);
if (!ret) if (!ret)
{ {
@ -351,20 +349,18 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename
preprocess_info.include_context = include; preprocess_info.include_context = include;
ret = vkd3d_shader_preprocess(&compile_info, &preprocessed_code, &messages); ret = vkd3d_shader_preprocess(&compile_info, &preprocessed_code, &messages);
if (messages)
if (messages && messages_blob)
{ {
if (messages_blob) if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob)))
{ {
if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob)))
{
vkd3d_shader_free_messages(messages);
vkd3d_shader_free_shader_code(&preprocessed_code);
return hr;
}
}
else
vkd3d_shader_free_messages(messages); vkd3d_shader_free_messages(messages);
vkd3d_shader_free_shader_code(&preprocessed_code);
return hr;
}
messages = NULL;
} }
vkd3d_shader_free_messages(messages);
if (!ret) if (!ret)
{ {