system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-01 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3dcompiler: Print message output with ERR() in D3DCompile2().

Browse source
This commit is contained in:
Zebediah Figura 2022-11-04 19:34:05 -05:00 committed by Alexandre Julliard
parent f801ac97fb
commit cee21cf3b8
1 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/d3dcompiler_43/compiler.c
View file

@ -173,6 +173,23 @@ static void close_include(const struct vkd3d_shader_code *code, void *context)
ID3DInclude_Close(iface, code->code);
}
static const char *get_line(const char **ptr)
{
const char *p, *q;
p = *ptr;
if (!(q = strstr(p, "\n")))
{
if (!*p)
return NULL;
*ptr += strlen(p);
return p;
}
*ptr = q + 1;
return p;
}
static HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char *filename,
const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader_blob,
ID3DBlob **messages_blob)
@ -486,8 +503,25 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen
}
ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages);
if (ret)
ERR("Failed to compile shader, vkd3d result %d.\n", ret);
if (messages)
{
if (*messages && ERR_ON(d3dcompiler))
{
const char *ptr = messages;
const char *line;
ERR("Shader log:\n");
while ((line = get_line(&ptr)))
{
ERR(" %.*s", (int)(ptr - line), line);
}
ERR("\n");
}
if (messages_blob)
{
size_t size = strlen(messages);