wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxbc: Add flag to ignore the DXBC checksum.

Browse Source
This commit is contained in:
Giovanni Mascellani
2024-01-21 00:01:28 +01:00
committed by Alexandre Julliard
parent 23259263cf
commit 75bc68962d
Notes: Alexandre Julliard 2024-03-11 23:05:11 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/582
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/vkd3d_shader.h
View File

@@ -218,6 +218,20 @@ enum vkd3d_shader_compile_option_feature_flags
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS),
}; };
/**
* Flags for vkd3d_shader_parse_dxbc().
*
* \since 1.12
*/
enum vkd3d_shader_parse_dxbc_flags
{
/** Ignore the checksum and continue parsing even if it is
* incorrect. */
VKD3D_SHADER_PARSE_DXBC_IGNORE_CHECKSUM = 0x00000001,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARSE_DXBC_FLAGS),
};
enum vkd3d_shader_compile_option_name enum vkd3d_shader_compile_option_name
{ {
/** /**
@@ -2385,9 +2399,8 @@ VKD3D_SHADER_API void vkd3d_shader_free_dxbc(struct vkd3d_shader_dxbc_desc *dxbc
* *
* \param dxbc A vkd3d_shader_code structure containing the DXBC blob to parse. * \param dxbc A vkd3d_shader_code structure containing the DXBC blob to parse.
* *
* \param flags A set of flags modifying the behaviour of the function. No * \param flags A combination of zero or more elements of enum
* flags are defined for this version of vkd3d-shader, and this parameter * vkd3d_shader_parse_dxbc_flags.
* should be set to 0.
* *
* \param desc A vkd3d_shader_dxbc_desc structure describing the contents of * \param desc A vkd3d_shader_dxbc_desc structure describing the contents of
* the DXBC blob. Its vkd3d_shader_dxbc_section_desc structures will contain * the DXBC blob. Its vkd3d_shader_dxbc_section_desc structures will contain

29
libs/vkd3d-shader/dxbc.c
View File

@@ -150,7 +150,7 @@ static const char *shader_get_string(const char *data, size_t data_size, size_t
} }
static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context, static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context,
const char *source_name, struct vkd3d_shader_dxbc_desc *desc) const char *source_name, uint32_t flags, struct vkd3d_shader_dxbc_desc *desc)
{ {
const struct vkd3d_shader_location location = {.source_name = source_name}; const struct vkd3d_shader_location location = {.source_name = source_name};
struct vkd3d_shader_dxbc_section_desc *sections, *section; struct vkd3d_shader_dxbc_section_desc *sections, *section;
@@ -186,17 +186,20 @@ static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_
checksum[1] = read_u32(&ptr); checksum[1] = read_u32(&ptr);
checksum[2] = read_u32(&ptr); checksum[2] = read_u32(&ptr);
checksum[3] = read_u32(&ptr); checksum[3] = read_u32(&ptr);
vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum); if (!(flags & VKD3D_SHADER_PARSE_DXBC_IGNORE_CHECKSUM))
if (memcmp(checksum, calculated_checksum, sizeof(checksum)))
{ {
WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match " vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum);
"calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", if (memcmp(checksum, calculated_checksum, sizeof(checksum)))
checksum[0], checksum[1], checksum[2], checksum[3], {
calculated_checksum[0], calculated_checksum[1], WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match "
calculated_checksum[2], calculated_checksum[3]); "calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, checksum[0], checksum[1], checksum[2], checksum[3],
"Invalid DXBC checksum."); calculated_checksum[0], calculated_checksum[1],
return VKD3D_ERROR_INVALID_ARGUMENT; calculated_checksum[2], calculated_checksum[3]);
vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM,
"Invalid DXBC checksum.");
return VKD3D_ERROR_INVALID_ARGUMENT;
}
} }
version = read_u32(&ptr); version = read_u32(&ptr);
@@ -287,7 +290,7 @@ static int for_each_dxbc_section(const struct vkd3d_shader_code *dxbc,
unsigned int i; unsigned int i;
int ret; int ret;
if ((ret = parse_dxbc(dxbc, message_context, source_name, &desc)) < 0) if ((ret = parse_dxbc(dxbc, message_context, source_name, 0, &desc)) < 0)
return ret; return ret;
for (i = 0; i < desc.section_count; ++i) for (i = 0; i < desc.section_count; ++i)
@@ -313,7 +316,7 @@ int vkd3d_shader_parse_dxbc(const struct vkd3d_shader_code *dxbc,
*messages = NULL; *messages = NULL;
vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO); vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO);
ret = parse_dxbc(dxbc, &message_context, NULL, desc); ret = parse_dxbc(dxbc, &message_context, NULL, flags, desc);
vkd3d_shader_message_context_trace_messages(&message_context); vkd3d_shader_message_context_trace_messages(&message_context);
if (!vkd3d_shader_message_context_copy_messages(&message_context, messages) && ret >= 0) if (!vkd3d_shader_message_context_copy_messages(&message_context, messages) && ret >= 0)