Signed-off-by: Hans-Kristian Arntzen post@arntzen-software.no --- libs/vkd3d-shader/dxbc.c | 27 ++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 28 insertions(+)
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d1987c4..4bdc328 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1891,6 +1891,7 @@ bool shader_sm4_is_end(void *data, const DWORD **ptr) #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_RTS0 MAKE_TAG('R', 'T', 'S', '0') +#define TAG_DXIL MAKE_TAG('D', 'X', 'I', 'L')
static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) { @@ -2118,6 +2119,20 @@ int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, return ret; }
+static int dxil_handler(const char *data, DWORD data_size, DWORD tag, void *context) +{ + switch (tag) + { + case TAG_DXIL: + *(bool *)context = true; + break; + default: + break; + } + + return VKD3D_OK; +} + static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *context) { struct vkd3d_shader_desc *desc = context; @@ -2210,6 +2225,18 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, return ret; }
+bool shader_is_dxil(const void *dxbc, size_t dxbc_length) +{ + bool dxil = false; + int ret = parse_dxbc(dxbc, dxbc_length, dxil_handler, &dxil); + if (ret < 0) + { + FIXME("Failed to parse shader, vkd3d result %d.\n", ret); + return false; + } + return dxil; +} + /* root signatures */ #define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 804d71c..c902d2c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -817,6 +817,7 @@ bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN;
int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; +bool shader_is_dxil(const void *dxbc, size_t dxbc_length) DECLSPEC_HIDDEN; void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN;
int shader_parse_input_signature(const void *dxbc, size_t dxbc_length,