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-shader/dxbc: Pass a vkd3d_shader_dxbc_section_desc structure to shader_parse_root_signature().

Browse Source
This commit is contained in:
Henri Verbeet 2023-02-20 14:23:53 +01:00 committed by Alexandre Julliard
parent 6c64f8a217
commit 5020781f76
Notes: Alexandre Julliard 2023-02-23 22:20:24 +01:00 
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/103
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2451,21 +2451,21 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co
return VKD3D_OK; return VKD3D_OK;
} }
static int shader_parse_root_signature(const char *data, unsigned int data_size, static int shader_parse_root_signature(const struct vkd3d_shader_code *data,
struct vkd3d_shader_versioned_root_signature_desc *desc) struct vkd3d_shader_versioned_root_signature_desc *desc)
{ {
struct vkd3d_shader_root_signature_desc *v_1_0 = &desc->u.v_1_0; struct vkd3d_shader_root_signature_desc *v_1_0 = &desc->u.v_1_0;
struct root_signature_parser_context context; struct root_signature_parser_context context;
unsigned int count, offset, version; unsigned int count, offset, version;
const char *ptr = data; const char *ptr = data->code;
int ret; int ret;
context.data = data; context.data = data->code;
context.data_size = data_size; context.data_size = data->size;
if (!require_space(0, 6, sizeof(DWORD), data_size)) if (!require_space(0, 6, sizeof(uint32_t), data->size))
{ {
WARN("Invalid data size %#x.\n", data_size); WARN("Invalid data size %#zx.\n", data->size);
return VKD3D_ERROR_INVALID_ARGUMENT; return VKD3D_ERROR_INVALID_ARGUMENT;
} }
@ -2537,11 +2537,12 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size,
static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *context) static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *context)
{ {
struct vkd3d_shader_versioned_root_signature_desc *desc = context; struct vkd3d_shader_versioned_root_signature_desc *desc = context;
struct vkd3d_shader_code code = {.code = data, .size = data_size};
if (tag != TAG_RTS0) if (tag != TAG_RTS0)
return VKD3D_OK; return VKD3D_OK;
return shader_parse_root_signature(data, data_size, desc); return shader_parse_root_signature(&code, desc);
} }
int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc,