July 2020 - Wine-devel - list.winehq.org

[PATCH] msvcrt: Use proper flags instead of characters for printf flags.
by Piotr Caban 14 Jul '20

14 Jul '20

Ports 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 to msvcrt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 101 ++++++++++++++++++++----------------------- dlls/msvcrt/wcs.c | 9 ++++ 2 files changed, 56 insertions(+), 54 deletions(-)

1 0

[PATCH v4 3/3] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui 14 Jul '20

14 Jul '20

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH v4 2/3] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui 14 Jul '20

14 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_root_parameter_type enumeration to vkd3d_shader_root_parameter_type.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 18 +++++------ libs/vkd3d-shader/dxbc.c | 60 +++++++++++++++++------------------ libs/vkd3d-shader/vkd3d_shader_main.c | 4 +-- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b5bf13a..1ce701c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -456,20 +456,20 @@ struct vkd3d_root_descriptor unsigned int register_space; }; -enum vkd3d_root_parameter_type +enum vkd3d_shader_root_parameter_type { - VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0, - VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = 1, - VKD3D_ROOT_PARAMETER_TYPE_CBV = 2, - VKD3D_ROOT_PARAMETER_TYPE_SRV = 3, - VKD3D_ROOT_PARAMETER_TYPE_UAV = 4, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0x0, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = 0x1, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV = 0x2, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV = 0x3, + VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV = 0x4, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_PARAMETER_TYPE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), }; struct vkd3d_root_parameter { - enum vkd3d_root_parameter_type parameter_type; + enum vkd3d_shader_root_parameter_type parameter_type; union { struct vkd3d_root_descriptor_table descriptor_table; @@ -549,7 +549,7 @@ struct vkd3d_root_descriptor1 struct vkd3d_root_parameter1 { - enum vkd3d_root_parameter_type parameter_type; + enum vkd3d_shader_root_parameter_type parameter_type; union { struct vkd3d_root_descriptor_table1 descriptor_table; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index cad2556..6297a04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2456,15 +2456,15 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co switch (parameters[i].parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ret = shader_parse_descriptor_table(context, offset, &parameters[i].u.descriptor_table); break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_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: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: ret = shader_parse_root_descriptor(context, offset, &parameters[i].u.descriptor); break; default: @@ -2504,15 +2504,15 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c switch (parameters[i].parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_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: + case VKD3D_SHADER_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: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: ret = shader_parse_root_descriptor1(context, offset, &parameters[i].u.descriptor); break; default: @@ -2678,7 +2678,7 @@ static unsigned int versioned_root_signature_get_parameter_count(const struct vk return desc->u.v_1_1.parameter_count; } -static enum vkd3d_root_parameter_type versioned_root_signature_get_parameter_type( +static enum vkd3d_shader_root_parameter_type versioned_root_signature_get_parameter_type( const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2938,18 +2938,18 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co switch (versioned_root_signature_get_parameter_type(desc, i)) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) ret = shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table); else ret = shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i)); break; - case VKD3D_ROOT_PARAMETER_TYPE_CBV: - case VKD3D_ROOT_PARAMETER_TYPE_SRV: - case VKD3D_ROOT_PARAMETER_TYPE_UAV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) ret = shader_write_root_descriptor(context, &desc->u.v_1_0.parameters[i].u.descriptor); else @@ -3115,10 +3115,10 @@ static int validate_root_signature_desc(const struct vkd3d_versioned_root_signat for (i = 0; i < versioned_root_signature_get_parameter_count(desc); ++i) { - enum vkd3d_root_parameter_type type; + enum vkd3d_shader_root_parameter_type type; type = versioned_root_signature_get_parameter_type(desc, i); - if (type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) ret = validate_descriptor_table_v_1_0(&desc->u.v_1_0.parameters[i].u.descriptor_table); @@ -3192,7 +3192,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters { const struct vkd3d_root_parameter *p = &parameters[i]; - if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } @@ -3213,7 +3213,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, p->parameter_type = p1->parameter_type; switch (p->parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ranges = NULL; if ((p->u.descriptor_table.descriptor_range_count = p1->u.descriptor_table.descriptor_range_count)) { @@ -3234,12 +3234,12 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, ranges[j].descriptor_table_offset = ranges1[j].descriptor_table_offset; } break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_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: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_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; @@ -3311,7 +3311,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete { const struct vkd3d_root_parameter1 *p = &parameters[i]; - if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } @@ -3332,7 +3332,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, p1->parameter_type = p->parameter_type; switch (p1->parameter_type) { - case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: ranges1 = NULL; if ((p1->u.descriptor_table.descriptor_range_count = p->u.descriptor_table.descriptor_range_count)) { @@ -3354,12 +3354,12 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, ranges1[j].descriptor_table_offset = ranges[j].descriptor_table_offset; } break; - case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + case VKD3D_SHADER_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: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_SHADER_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; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index b9caac7..f7489f6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -486,7 +486,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d { const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; - if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); } vkd3d_free((void *)root_signature->parameters); @@ -503,7 +503,7 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_d { const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; - if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); } vkd3d_free((void *)root_signature->parameters); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/dxbc.c | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ab670ec..b5bf13a 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -503,12 +503,14 @@ struct vkd3d_root_signature_desc }; /* root signature 1.1 */ -enum vkd3d_root_descriptor_flags +enum vkd3d_shader_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, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAGS), }; enum vkd3d_shader_descriptor_range_flags @@ -542,7 +544,7 @@ struct vkd3d_root_descriptor1 { unsigned int shader_register; unsigned int register_space; - enum vkd3d_root_descriptor_flags flags; + enum vkd3d_shader_root_descriptor_flags flags; }; struct vkd3d_root_parameter1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 76a6a47..cad2556 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2211,7 +2211,7 @@ 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_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) @@ -2398,10 +2398,10 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) { - unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown root descriptor flags %#x.\n", unknown_flags); -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d7711b0..ab670ec 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -522,7 +522,7 @@ enum vkd3d_shader_descriptor_range_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; -struct vkd3d_descriptor_range1 +struct vkd3d_shader_descriptor_range1 { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -535,7 +535,7 @@ struct vkd3d_descriptor_range1 struct vkd3d_root_descriptor_table1 { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range1 *descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; struct vkd3d_root_descriptor1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7692880..76a6a47 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2253,7 +2253,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } -static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +static void shader_validate_descriptor_range1(const struct vkd3d_shader_descriptor_range1 *range) { unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE @@ -2266,7 +2266,7 @@ static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_rang } static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range1 *ranges) { const char *ptr; unsigned int i; @@ -2329,7 +2329,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c 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; + struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; const char *ptr; @@ -2832,7 +2832,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table1 *table) { - const struct vkd3d_descriptor_range1 *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3080,7 +3080,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3200,7 +3200,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters 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; + const struct vkd3d_shader_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3320,7 +3320,7 @@ 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_shader_descriptor_range *ranges; - struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_shader_descriptor_range1 *ranges1; unsigned int i, j; int ret; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_descriptor_range structure to vkd3d_shader_descriptor_range.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc61dc5..d7711b0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -428,7 +428,7 @@ enum vkd3d_shader_descriptor_range_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), }; -struct vkd3d_descriptor_range +struct vkd3d_shader_descriptor_range { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -440,7 +440,7 @@ struct vkd3d_descriptor_range struct vkd3d_root_descriptor_table { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range *descriptor_ranges; + const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; struct vkd3d_root_constants diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6035aee..7692880 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2223,7 +2223,7 @@ struct root_signature_parser_context }; static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range *ranges) { const char *ptr; unsigned int i; @@ -2302,7 +2302,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context 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; + struct vkd3d_shader_descriptor_range *ranges; unsigned int count; const char *ptr; @@ -2809,7 +2809,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table *table) { - const struct vkd3d_descriptor_range *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3044,7 +3044,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3201,7 +3201,7 @@ 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; + struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3319,7 +3319,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete 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; + const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_descriptor_range1 *ranges1; unsigned int i, j; int ret; -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.
by Henri Verbeet 14 Jul '20

14 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 16 +++++++++------- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 50c64ca..cc61dc5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -511,13 +511,15 @@ enum vkd3d_root_descriptor_flags VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, }; -enum vkd3d_descriptor_range_flags +enum vkd3d_shader_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, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; struct vkd3d_descriptor_range1 @@ -526,7 +528,7 @@ struct vkd3d_descriptor_range1 unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; - enum vkd3d_descriptor_range_flags flags; + enum vkd3d_shader_descriptor_range_flags flags; unsigned int descriptor_table_offset; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a0f03cf..6035aee 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2214,7 +2214,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, #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) + (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) struct root_signature_parser_context { @@ -2255,11 +2255,11 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) { - unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown descriptor range flags %#x.\n", unknown_flags); -- 2.11.0

1 0

[PATCH] shlwapi/tests: Remove failing test.
by Nikolay Sivov 14 Jul '20

14 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/tests/ordinal.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8c5e3e261e2..919cac8563f 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1684,11 +1684,8 @@ if (0) LocalFileTimeToFileTime(&filetime, &filetime); /* no way to get required buffer length here */ - SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, NULL, NULL, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS /* Win7 */), - "expected 0xdeadbeef, got %d\n", GetLastError()); SetLastError(0xdeadbeef); buff[0] = 'a'; buff[1] = 0; -- 2.27.0

1 0

[PATCH] msxml3/tests: Remove traces.
by Nikolay Sivov 14 Jul '20

14 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 4 ---- dlls/msxml3/tests/httpreq.c | 1 - 2 files changed, 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f45364058a6..7f3b42d8401 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13146,8 +13146,6 @@ static BOOL qi_list_contains_service(REFIID service, REFIID iid) static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) { - trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); - if (qi_count < ARRAY_SIZE(qi_list)) qi_list[qi_count++] = iid; else @@ -13177,8 +13175,6 @@ static ULONG WINAPI sp_Release(IServiceProvider *iface) static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, REFIID iid, void **ppv) { - trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); - if (IsEqualGUID(service, &SID_SContainerDispatch) || IsEqualGUID(service, &SID_SInternetHostSecurityManager)) { diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 8a2ed2c73a3..74c302d5ebe 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -235,7 +235,6 @@ static IHTMLElementCollection htmlecoll = { &TestHTMLECollectionVtbl }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) { - trace("\n"); *ppvObject = NULL; return E_NOINTERFACE; } -- 2.27.0

1 0