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-utils: Parse the RD11 section.

Browse Source
This commit is contained in:
Zebediah Figura 2024-02-02 17:06:14 -06:00 committed by Alexandre Julliard
parent 90cd57404b
commit 2fceebd050
Notes: Alexandre Julliard 2024-03-27 23:06:24 +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/626
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/private/vkd3d_common.h
View File

@ -75,6 +75,8 @@
#define TAG_XNAP VKD3D_MAKE_TAG('X', 'N', 'A', 'P')
#define TAG_XNAS VKD3D_MAKE_TAG('X', 'N', 'A', 'S')
#define TAG_RD11_REVERSE 0x25441313
static inline uint64_t align(uint64_t addr, size_t alignment)
{
return (addr + (alignment - 1)) & ~(alignment - 1);

47
libs/vkd3d-utils/reflection.c
View File

@ -416,6 +416,19 @@ struct rdef_header
uint32_t creator_offset;
};
struct rdef_rd11
{
uint32_t magic;
uint32_t header_size;
uint32_t buffer_size;
uint32_t binding_size;
uint32_t variable_size;
uint32_t type_size;
uint32_t field_size;
/* Always zero. Possibly either padding or a null terminator? */
uint32_t zero;
};
struct rdef_buffer
{
uint32_t name_offset;
@ -449,11 +462,45 @@ static HRESULT d3d12_buffer_init(struct d3d12_buffer *buffer, const struct rdef_
static HRESULT parse_rdef(struct d3d12_reflection *reflection, const struct vkd3d_shader_code *section)
{
const struct rdef_header *header;
const struct rdef_rd11 *rd11;
HRESULT hr;
if (!(header = get_data_ptr(section, 0, 1, sizeof(*header))))
return E_INVALIDARG;
if (header->major_version >= 5)
{
if (!(rd11 = get_data_ptr(section, sizeof(*header), 1, sizeof(*rd11))))
return E_INVALIDARG;
/* RD11 is emitted for 5.0, the reversed version for 5.1 and 6.0.
* This corresponds to a difference in the binding_size member, but
* it's not clear why the magic also changed there. */
if (rd11->magic != TAG_RD11 && rd11->magic != TAG_RD11_REVERSE)
{
FIXME("Unknown tag %#x.\n", rd11->magic);
return E_INVALIDARG;
}
if (rd11->header_size != sizeof(struct rdef_header) + sizeof(struct rdef_rd11))
{
FIXME("Unexpected header size %#x.\n", rd11->header_size);
return E_INVALIDARG;
}
if (rd11->buffer_size != sizeof(struct rdef_buffer))
{
FIXME("Unexpected buffer size %#x.\n", rd11->buffer_size);
return E_INVALIDARG;
}
if (rd11->zero)
{
FIXME("Unexpected field %#x.\n", rd11->zero);
return E_INVALIDARG;
}
}
reflection->desc.ConstantBuffers = header->buffer_count;
if (header->buffer_count)