April 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d v2 6/6] vkd3d-shader: Remove vkd3d_shader_parse_root_signature().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 10 ++-------- libs/vkd3d-shader/dxbc.c | 26 -------------------------- libs/vkd3d-shader/vkd3d_shader.map | 1 - tests/vkd3d_shader_api.c | 14 +++++++------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7bf3bd5e4514..ae315e66d4db 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -566,13 +566,10 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); - int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); +void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, @@ -602,13 +599,10 @@ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxb const struct vkd3d_shader_compile_arguments *compile_args); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); -typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); - typedef int (*PFN_vkd3d_shader_parse_versioned_root_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 082e01d47ced..5903ed8ae155 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2503,32 +2503,6 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont return shader_parse_root_signature(data, data_size, desc); } -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature) -{ - struct vkd3d_versioned_root_signature_desc desc = {0}; - int ret; - - TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); - - memset(root_signature, 0, sizeof(*root_signature)); - if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, &desc)) < 0) - { - vkd3d_shader_free_versioned_root_signature(&desc); - return ret; - } - - if (desc.version != VKD3D_ROOT_SIGNATURE_VERSION_1_0) - { - vkd3d_shader_free_versioned_root_signature(&desc); - return VKD3D_ERROR_NOT_IMPLEMENTED; - } - - *root_signature = desc.u.v_1_0; - - return VKD3D_OK; -} - int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature) { diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index e1f1f1c179a2..2959c5756223 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,7 +9,6 @@ global: vkd3d_shader_free_shader_signature; vkd3d_shader_free_versioned_root_signature; vkd3d_shader_parse_input_signature; - vkd3d_shader_parse_root_signature; vkd3d_shader_parse_versioned_root_signature; vkd3d_shader_scan_dxbc; vkd3d_shader_serialize_root_signature; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 65099f22f9a7..4e6080dbd901 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -54,17 +54,17 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_parse_versioned_root_signature pfn_vkd3d_shader_parse_versioned_root_signature; + PFN_vkd3d_shader_free_versioned_root_signature pfn_vkd3d_shader_free_versioned_root_signature; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; PFN_vkd3d_shader_parse_input_signature pfn_vkd3d_shader_parse_input_signature; - PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; - PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; - struct vkd3d_root_signature_desc root_signature_desc; + struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_signature signature; @@ -90,21 +90,21 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_parse_versioned_root_signature = vkd3d_shader_parse_versioned_root_signature; + pfn_vkd3d_shader_free_versioned_root_signature = vkd3d_shader_free_versioned_root_signature; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; pfn_vkd3d_shader_parse_input_signature = vkd3d_shader_parse_input_signature; - pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; - pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_versioned_root_signature(&dxbc, &root_signature_desc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - pfn_vkd3d_shader_free_root_signature(&root_signature_desc); + pfn_vkd3d_shader_free_versioned_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); -- 2.21.0

2 1

[PATCH vkd3d v2 5/6] vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_main.c | 2 +- libs/vkd3d/vkd3d_private.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 85ecb395f3dc..7534655673f2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1006,7 +1006,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, HRESULT hr; int ret; - if ((ret = vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc.vkd3d)) < 0) + if ((ret = vkd3d_parse_root_signature_v_1_0(&dxbc, &root_signature_desc.vkd3d)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 9af2bbc94250..e074d1cdbca9 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -167,7 +167,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des d3d12_root_signature_deserializer_GetRootSignatureDesc, }; -static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, +int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *out_desc) { struct vkd3d_versioned_root_signature_desc desc, converted_desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index be0ef2eb5bf2..c680a04a2567 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -619,6 +619,9 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; +int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct d3d12_graphics_pipeline_state { VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; -- 2.21.0

2 1

[PATCH vkd3d v2 4/6] vkd3d: Reimplement ID3D12RootSignatureDeserializer on top of vkd3d_shader_parse_versioned_root_signature().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index be8c400caf4c..9af2bbc94250 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -167,6 +167,40 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des d3d12_root_signature_deserializer_GetRootSignatureDesc, }; +static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *out_desc) +{ + struct vkd3d_versioned_root_signature_desc desc, converted_desc; + int ret; + + if ((ret = vkd3d_shader_parse_versioned_root_signature(dxbc, &desc)) < 0) + { + WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + return ret; + } + + if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + *out_desc = desc.u.v_1_0; + } + else + { + enum vkd3d_root_signature_version version = desc.version; + + ret = vkd3d_shader_convert_root_signature(&converted_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &desc); + vkd3d_shader_free_versioned_root_signature(&desc); + if (ret < 0) + { + WARN("Failed to convert from version %#x, vkd3d result %d.\n", version, ret); + return ret; + } + + *out_desc = converted_desc.u.v_1_0; + } + + return ret; +} + static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signature_deserializer *deserializer, const struct vkd3d_shader_code *dxbc) { @@ -175,11 +209,8 @@ static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signatur deserializer->ID3D12RootSignatureDeserializer_iface.lpVtbl = &d3d12_root_signature_deserializer_vtbl; deserializer->refcount = 1; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) - { - WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + if ((ret = vkd3d_parse_root_signature_v_1_0(dxbc, &deserializer->desc.vkd3d)) < 0) return hresult_from_vkd3d_result(ret); - } return S_OK; } -- 2.21.0

2 1

[PATCH vkd3d v2 3/6] vkd3d-shader: Implement conversion between root signature 1.0 and 1.1.
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 6 + libs/vkd3d-shader/dxbc.c | 286 +++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + 3 files changed, 293 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 506d519ea630..7bf3bd5e4514 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -578,6 +578,9 @@ void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_sign int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src); + int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); @@ -610,6 +613,9 @@ typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_vers typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +typedef int (*PFN_vkd3d_shader_convert_root_signature)(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src); + typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 9ed7faadf784..082e01d47ced 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2088,6 +2088,11 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + +#define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ + (VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) + struct root_signature_parser_context { const char *data; @@ -2835,3 +2840,284 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc return VKD3D_OK; } + +static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) +{ + unsigned int i; + + if (!parameters) + return; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter *p = &parameters[i]; + + if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); + } +} + +static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, + const struct vkd3d_root_parameter1 *src, unsigned int count) +{ + const struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_descriptor_range *ranges; + unsigned int i, j; + int ret; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter1 *p1 = &src[i]; + struct vkd3d_root_parameter *p = &dst[i]; + + p->parameter_type = p1->parameter_type; + switch (p->parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ranges = NULL; + if ((p->u.descriptor_table.descriptor_range_count = p1->u.descriptor_table.descriptor_range_count)) + { + if (!(ranges = vkd3d_calloc(p->u.descriptor_table.descriptor_range_count, sizeof(*ranges)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + } + p->u.descriptor_table.descriptor_ranges = ranges; + ranges1 = p1->u.descriptor_table.descriptor_ranges; + for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) + { + ranges[j].range_type = ranges1[j].range_type; + ranges[j].descriptor_count = ranges1[j].descriptor_count; + ranges[j].base_shader_register = ranges1[j].base_shader_register; + ranges[j].register_space = ranges1[j].register_space; + ranges[j].descriptor_table_offset = ranges1[j].descriptor_table_offset; + } + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + p->u.constants = p1->u.constants; + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + p->u.descriptor.shader_register = p1->u.descriptor.shader_register; + p->u.descriptor.register_space = p1->u.descriptor.register_space; + break; + default: + WARN("Invalid root parameter type %#x.\n", p->parameter_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + goto fail; + + } + p->shader_visibility = p1->shader_visibility; + } + + return VKD3D_OK; + +fail: + free_descriptor_ranges(dst, i); + return ret; +} + +static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_desc *dst, + const struct vkd3d_versioned_root_signature_desc *src) +{ + const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; + struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_root_parameter *parameters = NULL; + int ret; + + if ((dst_desc->parameter_count = src_desc->parameter_count)) + { + if (!(parameters = vkd3d_calloc(dst_desc->parameter_count, sizeof(*parameters)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + if ((ret = convert_root_parameters_to_v_1_0(parameters, src_desc->parameters, src_desc->parameter_count)) < 0) + goto fail; + } + dst_desc->parameters = parameters; + if ((dst_desc->static_sampler_count = src_desc->static_sampler_count)) + { + if (!(samplers = vkd3d_calloc(dst_desc->static_sampler_count, sizeof(*samplers)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + memcpy(samplers, src_desc->static_samplers, src_desc->static_sampler_count * sizeof(*samplers)); + } + dst_desc->static_samplers = samplers; + dst_desc->flags = src_desc->flags; + + return VKD3D_OK; + +fail: + free_descriptor_ranges(parameters, dst_desc->parameter_count); + vkd3d_free(parameters); + vkd3d_free(samplers); + return ret; +} + +static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *parameters, unsigned int count) +{ + unsigned int i; + + if (!parameters) + return; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter1 *p = &parameters[i]; + + if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); + } +} + +static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, + const struct vkd3d_root_parameter *src, unsigned int count) +{ + const struct vkd3d_descriptor_range *ranges; + struct vkd3d_descriptor_range1 *ranges1; + unsigned int i, j; + int ret; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter *p = &src[i]; + struct vkd3d_root_parameter1 *p1 = &dst[i]; + + p1->parameter_type = p->parameter_type; + switch (p1->parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ranges1 = NULL; + if ((p1->u.descriptor_table.descriptor_range_count = p->u.descriptor_table.descriptor_range_count)) + { + if (!(ranges1 = vkd3d_calloc(p1->u.descriptor_table.descriptor_range_count, sizeof(*ranges1)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + } + p1->u.descriptor_table.descriptor_ranges = ranges1; + ranges = p->u.descriptor_table.descriptor_ranges; + for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) + { + ranges1[j].range_type = ranges[j].range_type; + ranges1[j].descriptor_count = ranges[j].descriptor_count; + ranges1[j].base_shader_register = ranges[j].base_shader_register; + ranges1[j].register_space = ranges[j].register_space; + ranges1[j].flags = VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS; + ranges1[j].descriptor_table_offset = ranges[j].descriptor_table_offset; + } + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + p1->u.constants = p->u.constants; + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + p1->u.descriptor.shader_register = p->u.descriptor.shader_register; + p1->u.descriptor.register_space = p->u.descriptor.register_space; + p1->u.descriptor.flags = VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS; + break; + default: + WARN("Invalid root parameter type %#x.\n", p1->parameter_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + goto fail; + + } + p1->shader_visibility = p->shader_visibility; + } + + return VKD3D_OK; + +fail: + free_descriptor_ranges1(dst, i); + return ret; +} + +static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_desc *dst, + const struct vkd3d_versioned_root_signature_desc *src) +{ + const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; + struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; + struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_root_parameter1 *parameters = NULL; + int ret; + + if ((dst_desc->parameter_count = src_desc->parameter_count)) + { + if (!(parameters = vkd3d_calloc(dst_desc->parameter_count, sizeof(*parameters)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + if ((ret = convert_root_parameters_to_v_1_1(parameters, src_desc->parameters, src_desc->parameter_count)) < 0) + goto fail; + } + dst_desc->parameters = parameters; + if ((dst_desc->static_sampler_count = src_desc->static_sampler_count)) + { + if (!(samplers = vkd3d_calloc(dst_desc->static_sampler_count, sizeof(*samplers)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + memcpy(samplers, src_desc->static_samplers, src_desc->static_sampler_count * sizeof(*samplers)); + } + dst_desc->static_samplers = samplers; + dst_desc->flags = src_desc->flags; + + return VKD3D_OK; + +fail: + free_descriptor_ranges1(parameters, dst_desc->parameter_count); + vkd3d_free(parameters); + vkd3d_free(samplers); + return ret; +} + +int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src) +{ + int ret; + + TRACE("dst %p, version %#x, src %p.\n", dst, version, src); + + if (src->version == version) + { + WARN("Nothing to convert.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (src->version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && src->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", src->version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + memset(dst, 0, sizeof(*dst)); + dst->version = version; + + if (version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + ret = convert_root_signature_to_v1_0(dst, src); + } + else + { + assert(version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + ret = convert_root_signature_to_v1_1(dst, src); + } + + return ret; +} diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 52ca4edcc50a..e1f1f1c179a2 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -2,6 +2,7 @@ VKD3D_1_0 { global: vkd3d_shader_compile_dxbc; + vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; vkd3d_shader_free_shader_code; -- 2.21.0

2 1

[PATCH vkd3d v2 1/6] vkd3d-shader: Implement parsing of root signature 1.1.
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 82 +++++++ libs/vkd3d-shader/dxbc.c | 306 +++++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader.map | 2 + libs/vkd3d-shader/vkd3d_shader_main.c | 35 +++ 4 files changed, 369 insertions(+), 56 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 15a0b22d64dc..506d519ea630 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -216,6 +216,7 @@ struct vkd3d_shader_domain_shader_compile_arguments enum vkd3d_tessellator_output_primitive partitioning; }; +/* root signature 1.0 */ enum vkd3d_filter { VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, @@ -393,13 +394,86 @@ struct vkd3d_root_signature_desc enum vkd3d_root_signature_flags flags; }; +/* root signature 1.1 */ +enum vkd3d_root_descriptor_flags +{ + VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, +}; + +enum vkd3d_descriptor_range_flags +{ + VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, +}; + +struct vkd3d_descriptor_range1 +{ + enum vkd3d_descriptor_range_type range_type; + unsigned int descriptor_count; + unsigned int base_shader_register; + unsigned int register_space; + enum vkd3d_descriptor_range_flags flags; + unsigned int descriptor_table_offset; +}; + +struct vkd3d_root_descriptor_table1 +{ + unsigned int descriptor_range_count; + const struct vkd3d_descriptor_range1 *descriptor_ranges; +}; + +struct vkd3d_root_descriptor1 +{ + unsigned int shader_register; + unsigned int register_space; + enum vkd3d_root_descriptor_flags flags; +}; + +struct vkd3d_root_parameter1 +{ + enum vkd3d_root_parameter_type parameter_type; + union + { + struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_root_constants constants; + struct vkd3d_root_descriptor1 descriptor; + } u; + enum vkd3d_shader_visibility shader_visibility; +}; + +struct vkd3d_root_signature_desc1 +{ + unsigned int parameter_count; + const struct vkd3d_root_parameter1 *parameters; + unsigned int static_sampler_count; + const struct vkd3d_static_sampler_desc *static_samplers; + enum vkd3d_root_signature_flags flags; +}; + enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, + VKD3D_ROOT_SIGNATURE_VERSION_1_1 = 0x2, VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; +struct vkd3d_versioned_root_signature_desc +{ + enum vkd3d_root_signature_version version; + union + { + struct vkd3d_root_signature_desc v_1_0; + struct vkd3d_root_signature_desc1 v_1_1; + } u; +}; + /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 @@ -496,6 +570,10 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *root_signature); void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); +int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature); +void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); + /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); @@ -525,6 +603,10 @@ typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_c struct vkd3d_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); +typedef int (*PFN_vkd3d_shader_parse_versioned_root_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); + typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 996a7e544c1e..9ed7faadf784 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2087,18 +2087,25 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, return ret; } -static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_descriptor_range *ranges) +/* root signatures */ +struct root_signature_parser_context +{ + const char *data; + unsigned int data_size; +}; + +static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) { const char *ptr; unsigned int i; - if (!require_space(offset, 5 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 5 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2118,19 +2125,51 @@ static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_descriptor_table(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_descriptor_table *table) +static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) +{ + const char *ptr; + unsigned int i; + + if (!require_space(offset, 6 * count, sizeof(uint32_t), context->data_size)) + { + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &ranges[i].range_type); + read_dword(&ptr, &ranges[i].descriptor_count); + read_dword(&ptr, &ranges[i].base_shader_register); + read_dword(&ptr, &ranges[i].register_space); + read_dword(&ptr, &ranges[i].flags); + read_dword(&ptr, &ranges[i].descriptor_table_offset); + + TRACE("Type %#x, descriptor count %u, base shader register %u, " + "register space %u, flags %#x, offset %u.\n", + ranges[i].range_type, ranges[i].descriptor_count, + ranges[i].base_shader_register, ranges[i].register_space, + ranges[i].flags, ranges[i].descriptor_table_offset); + } + + return VKD3D_OK; +} + +static int shader_parse_descriptor_table(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor_table *table) { struct vkd3d_descriptor_range *ranges; + unsigned int count; const char *ptr; - DWORD count; - if (!require_space(offset, 2, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; read_dword(&ptr, &count); read_dword(&ptr, &offset); @@ -2142,20 +2181,47 @@ static int shader_parse_descriptor_table(const char *data, DWORD data_size, if (!(ranges = vkd3d_calloc(count, sizeof(*ranges)))) return VKD3D_ERROR_OUT_OF_MEMORY; table->descriptor_ranges = ranges; - return shader_parse_descriptor_ranges(data, data_size, offset, count, ranges); + return shader_parse_descriptor_ranges(context, offset, count, ranges); } -static int shader_parse_root_constants(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_constants *constants) +static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor_table1 *table) { + struct vkd3d_descriptor_range1 *ranges; + unsigned int count; const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; + + read_dword(&ptr, &count); + read_dword(&ptr, &offset); + + TRACE("Descriptor range count %u.\n", count); + + table->descriptor_range_count = count; + + if (!(ranges = vkd3d_calloc(count, sizeof(*ranges)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + table->descriptor_ranges = ranges; + return shader_parse_descriptor_ranges1(context, offset, count, ranges); +} + +static int shader_parse_root_constants(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_constants *constants) +{ + const char *ptr; + + if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; read_dword(&ptr, &constants->shader_register); read_dword(&ptr, &constants->register_space); @@ -2167,17 +2233,17 @@ static int shader_parse_root_constants(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_descriptor(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_descriptor *descriptor) +static int shader_parse_root_descriptor(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor *descriptor) { const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; read_dword(&ptr, &descriptor->shader_register); read_dword(&ptr, &descriptor->register_space); @@ -2188,19 +2254,41 @@ static int shader_parse_root_descriptor(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_parameters(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_root_parameter *parameters) +static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) +{ + const char *ptr; + + if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + read_dword(&ptr, &descriptor->shader_register); + read_dword(&ptr, &descriptor->register_space); + read_dword(&ptr, &descriptor->flags); + + TRACE("Shader register %u, register space %u, flags %#x.\n", + descriptor->shader_register, descriptor->register_space, descriptor->flags); + + return VKD3D_OK; +} + +static int shader_parse_root_parameters(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) { const char *ptr; unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2214,15 +2302,15 @@ static int shader_parse_root_parameters(const char *data, DWORD data_size, switch (parameters[i].parameter_type) { case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: - ret = shader_parse_descriptor_table(data, data_size, offset, &parameters[i].u.descriptor_table); + ret = shader_parse_descriptor_table(context, offset, &parameters[i].u.descriptor_table); break; case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_parse_root_constants(data, data_size, offset, &parameters[i].u.constants); + ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); break; case VKD3D_ROOT_PARAMETER_TYPE_CBV: case VKD3D_ROOT_PARAMETER_TYPE_SRV: case VKD3D_ROOT_PARAMETER_TYPE_UAV: - ret = shader_parse_root_descriptor(data, data_size, offset, &parameters[i].u.descriptor); + ret = shader_parse_root_descriptor(context, offset, &parameters[i].u.descriptor); break; default: FIXME("Unrecognized type %#x.\n", parameters[i].parameter_type); @@ -2236,18 +2324,66 @@ static int shader_parse_root_parameters(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_static_samplers(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_static_sampler_desc *sampler_descs) +static int shader_parse_root_parameters1(struct root_signature_parser_context *context, + DWORD offset, DWORD count, struct vkd3d_root_parameter1 *parameters) { const char *ptr; unsigned int i; + int ret; - if (!require_space(offset, 13 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; + + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &parameters[i].parameter_type); + read_dword(&ptr, &parameters[i].shader_visibility); + read_dword(&ptr, &offset); + + TRACE("Type %#x, shader visibility %#x.\n", + parameters[i].parameter_type, parameters[i].shader_visibility); + + switch (parameters[i].parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ret = shader_parse_descriptor_table1(context, offset, &parameters[i].u.descriptor_table); + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + ret = shader_parse_root_descriptor1(context, offset, &parameters[i].u.descriptor); + break; + default: + FIXME("Unrecognized type %#x.\n", parameters[i].parameter_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (ret < 0) + return ret; + } + + return VKD3D_OK; +} + +static int shader_parse_static_samplers(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_static_sampler_desc *sampler_descs) +{ + const char *ptr; + unsigned int i; + + if (!require_space(offset, 13 * count, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2269,60 +2405,92 @@ static int shader_parse_static_samplers(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_signature(const char *data, DWORD data_size, - struct vkd3d_root_signature_desc *desc) +static int shader_parse_root_signature(const char *data, unsigned int data_size, + struct vkd3d_versioned_root_signature_desc *desc) { + struct vkd3d_root_signature_desc *v_1_0 = &desc->u.v_1_0; + struct root_signature_parser_context context; + unsigned int count, offset, version; const char *ptr = data; - DWORD count, offset; int ret; + context.data = data; + context.data_size = data_size; + if (!require_space(0, 6, sizeof(DWORD), data_size)) { WARN("Invalid data size %#x.\n", data_size); return VKD3D_ERROR_INVALID_ARGUMENT; } - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("Version %#x.\n", version); + if (version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + FIXME("Unknown version %#x.\n", version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + desc->version = version; read_dword(&ptr, &count); read_dword(&ptr, &offset); TRACE("Parameter count %u, offset %u.\n", count, offset); - desc->parameter_count = count; - if (desc->parameter_count) + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) { - struct vkd3d_root_parameter *parameters; - if (!(parameters = vkd3d_calloc(desc->parameter_count, sizeof(*parameters)))) - return VKD3D_ERROR_OUT_OF_MEMORY; - desc->parameters = parameters; - if ((ret = shader_parse_root_parameters(data, data_size, offset, count, parameters)) < 0) - return ret; + v_1_0->parameter_count = count; + if (v_1_0->parameter_count) + { + struct vkd3d_root_parameter *parameters; + if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + v_1_0->parameters = parameters; + if ((ret = shader_parse_root_parameters(&context, offset, count, parameters)) < 0) + return ret; + } + } + else + { + struct vkd3d_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; + + assert(version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + + v_1_1->parameter_count = count; + if (v_1_1->parameter_count) + { + struct vkd3d_root_parameter1 *parameters; + if (!(parameters = vkd3d_calloc(v_1_1->parameter_count, sizeof(*parameters)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + v_1_1->parameters = parameters; + if ((ret = shader_parse_root_parameters1(&context, offset, count, parameters)) < 0) + return ret; + } } read_dword(&ptr, &count); read_dword(&ptr, &offset); TRACE("Static sampler count %u, offset %u.\n", count, offset); - desc->static_sampler_count = count; - if (desc->static_sampler_count) + v_1_0->static_sampler_count = count; + if (v_1_0->static_sampler_count) { struct vkd3d_static_sampler_desc *samplers; - if (!(samplers = vkd3d_calloc(desc->static_sampler_count, sizeof(*samplers)))) + if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers)))) return VKD3D_ERROR_OUT_OF_MEMORY; - desc->static_samplers = samplers; - if ((ret = shader_parse_static_samplers(data, data_size, offset, count, samplers)) < 0) + v_1_0->static_samplers = samplers; + if ((ret = shader_parse_static_samplers(&context, offset, count, samplers)) < 0) return ret; } - read_dword(&ptr, &desc->flags); - TRACE("Flags %#x.\n", desc->flags); + read_dword(&ptr, &v_1_0->flags); + TRACE("Flags %#x.\n", v_1_0->flags); return VKD3D_OK; } static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *context) { - struct vkd3d_root_signature_desc *desc = context; + struct vkd3d_versioned_root_signature_desc *desc = context; if (tag != TAG_RTS0) return VKD3D_OK; @@ -2332,6 +2500,32 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *root_signature) +{ + struct vkd3d_versioned_root_signature_desc desc = {0}; + int ret; + + TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); + + memset(root_signature, 0, sizeof(*root_signature)); + if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, &desc)) < 0) + { + vkd3d_shader_free_versioned_root_signature(&desc); + return ret; + } + + if (desc.version != VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_versioned_root_signature(&desc); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + + *root_signature = desc.u.v_1_0; + + return VKD3D_OK; +} + +int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature) { int ret; @@ -2340,7 +2534,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, root_signature)) < 0) { - vkd3d_shader_free_root_signature(root_signature); + vkd3d_shader_free_versioned_root_signature(root_signature); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 92e4d06b0095..52ca4edcc50a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -6,8 +6,10 @@ global: vkd3d_shader_free_root_signature; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_free_versioned_root_signature; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; + vkd3d_shader_parse_versioned_root_signature; vkd3d_shader_scan_dxbc; vkd3d_shader_serialize_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 55cb56c2e191..d56794105829 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -344,6 +344,41 @@ void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_sig memset(root_signature, 0, sizeof(*root_signature)); } +void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +{ + struct vkd3d_root_signature_desc1 *root_signature; + unsigned int i; + + if (!desc->version) + return; + + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_root_signature(&desc->u.v_1_0); + return; + } + + if (desc->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + FIXME("Unknown version %#x.\n", desc->version); + return; + } + + root_signature = &desc->u.v_1_1; + + for (i = 0; i < root_signature->parameter_count; ++i) + { + const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; + + if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); + } + vkd3d_free((void *)root_signature->parameters); + vkd3d_free((void *)root_signature->static_samplers); + + memset(root_signature, 0, sizeof(*root_signature)); +} + int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature) { -- 2.21.0

2 1

[PATCH] wined3d: Check GLSL version when using ARB_shader_bit_encoding with uvec4.
by Paul Gofman 19 Apr '19

19 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47039 There are GPUs which support ARB_shader_bit_encoding with GLSL version 1.2 and uvec4 data type is available since GLSL 1.3. Spotted with Intel Ironlake Mobile. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d4678965d..0d0e8b25c9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -442,7 +442,7 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co wined3d_ftoa(values[2], str[2]); wined3d_ftoa(values[3], str[3]); - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + if (gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) { const unsigned int *uint_values = (const unsigned int *)values; @@ -3316,7 +3316,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + if (gl_info->supported[ARB_SHADER_BIT_ENCODING] + && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) { string_buffer_sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", reg->u.immconst_data[0], reg->u.immconst_data[1], -- 2.20.1

3 7

[PATCH 1/5] ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Derek Lesho 19 Apr '19

19 Apr '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 18 ++++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3789abda35..0ab150ea65 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3233,6 +3233,24 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE threadid, PETHREAD *thread) +{ + NTSTATUS status; + HANDLE hThread = OpenThread( THREAD_ALL_ACCESS, FALSE, HandleToUlong(threadid) ); + + if (!hThread) + return STATUS_INVALID_PARAMETER; + + status = ObReferenceObjectByHandle( hThread, THREAD_ALL_ACCESS, PsThreadType, KernelMode, (void**)thread, NULL ); + + NtClose( hThread ); + return status; +} + + /***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 141c8aa639..f965ff55ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -914,7 +914,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c3839da3bf..4b846869fc 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -29,6 +29,7 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "driver.h" @@ -1167,6 +1168,22 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#x\n", status); } +static void test_lookup_thread(void) +{ + NTSTATUS status; + PETHREAD thread = NULL; + + status = PsLookupThreadByThreadId(PsGetCurrentThreadId(), &thread); + ok(!status, "PsLookupThreadByThreadId failed: %#x\n", status); + ok((PKTHREAD)thread == KeGetCurrentThread(), "thread != KeGetCurrentThread\n"); + + if (thread) + ObDereferenceObject(thread); + + status = PsLookupThreadByThreadId(NULL, &thread); + ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1210,6 +1227,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_lookaside_list(); test_ob_reference(test_input->path); test_resource(); + test_lookup_thread(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index abe357fbc9..9b57ae7ad7 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); #endif -- 2.20.1

3 13

[PATCH 2/3] msi/tests: Check the NT key first when retrieving registered owner and organization.
by Hans Leidekker 19 Apr '19

19 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 60ae92e64c..7a515df9b0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase else { if (bcase) - ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); else - ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); } } @@ -3408,7 +3408,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner"); @@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner"); -- 2.20.1

2 1

[PATCH 3/3] msi: Always use the 64-bit registry view to retrieve registered owner and organization.
by Hans Leidekker 19 Apr '19

19 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/package.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 490c687d78..1e16fb18ce 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 }; - static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; + static const WCHAR szRegisteredOwner[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; static const WCHAR szRegisteredOrganization[] = { 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 }; @@ -971,10 +971,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) CloseHandle( hkey ); } if ((!username || !companyname) && - RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, &hkey ) == ERROR_SUCCESS) + RegOpenKeyExW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, + &hkey ) == ERROR_SUCCESS) { if (!username && - (username = msi_reg_get_val_str( hkey, szRegisteredUser ))) + (username = msi_reg_get_val_str( hkey, szRegisteredOwner ))) msi_set_property( package->db, szUSERNAME, username, -1 ); if (!companyname && (companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization ))) -- 2.20.1

1 0

[PATCH 1/3] msi: Get rid of redundant KEY_WOW64_64KEY flags.
by Hans Leidekker 19 Apr '19

19 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3eca3bfb8d..8c350f61bd 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1747,11 +1747,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch ); + res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_READ, &patch ); if (res != ERROR_SUCCESS) goto done; @@ -1761,7 +1761,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done; -- 2.20.1

1 0