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

[PATCH 11/17] msvcrt: Add _ismbcgraph_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 10/17] msvcrt: Add _ismbcdigit_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 09/17] msvcrt: Add _ismbcalnum_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

1 0

[PATCH 08/17] msvcrt: Add _ismbbkana_l implementation.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 30 ++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 11 files changed, 33 insertions(+), 19 deletions(-)

1 0

[PATCH 07/17] msvcrt: Don't use toupperW.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 01/17] msvcrt: Don't use tolowerW in _towlower_l.
by Piotr Caban 16 Jul '20

16 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d 5/5] vkd3d-shader: Rename the vkd3d_texture_address_mode enumeration to vkd3d_shader_texture_address_mode.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2ae35ae..20f9678 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -367,15 +367,15 @@ enum vkd3d_shader_filter VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; -enum vkd3d_texture_address_mode +enum vkd3d_shader_texture_address_mode { - VKD3D_TEXTURE_ADDRESS_MODE_WRAP = 1, - VKD3D_TEXTURE_ADDRESS_MODE_MIRROR = 2, - VKD3D_TEXTURE_ADDRESS_MODE_CLAMP = 3, - VKD3D_TEXTURE_ADDRESS_MODE_BORDER = 4, - VKD3D_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 5, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_WRAP = 0x1, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR = 0x2, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_CLAMP = 0x3, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_BORDER = 0x4, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 0x5, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_TEXTURE_ADDRESS_MODE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; enum vkd3d_comparison_func @@ -404,9 +404,9 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { enum vkd3d_shader_filter filter; - enum vkd3d_texture_address_mode address_u; - enum vkd3d_texture_address_mode address_v; - enum vkd3d_texture_address_mode address_w; + enum vkd3d_shader_texture_address_mode address_u; + enum vkd3d_shader_texture_address_mode address_v; + enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_comparison_func comparison_func; -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_filter enumeration to vkd3d_shader_filter.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 82 +++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2c3dc9..2ae35ae 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -325,46 +325,46 @@ struct vkd3d_shader_spirv_domain_shader_target_info }; /* root signature 1.0 */ -enum vkd3d_filter -{ - VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, - VKD3D_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1, - VKD3D_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4, - VKD3D_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5, - VKD3D_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10, - VKD3D_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11, - VKD3D_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14, - VKD3D_FILTER_MIN_MAG_MIP_LINEAR = 0x15, - VKD3D_FILTER_ANISOTROPIC = 0x55, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80, - VKD3D_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84, - VKD3D_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90, - VKD3D_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91, - VKD3D_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94, - VKD3D_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95, - VKD3D_FILTER_COMPARISON_ANISOTROPIC = 0xd5, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, - VKD3D_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, - VKD3D_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, - VKD3D_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, - VKD3D_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, - VKD3D_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, - VKD3D_FILTER_MINIMUM_ANISOTROPIC = 0x155, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, - VKD3D_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, - VKD3D_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, - VKD3D_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, - VKD3D_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, - VKD3D_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, - VKD3D_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_FILTER), +enum vkd3d_shader_filter +{ + VKD3D_SHADER_FILTER_MIN_MAG_MIP_POINT = 0x000, + VKD3D_SHADER_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x001, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x004, + VKD3D_SHADER_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x005, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x010, + VKD3D_SHADER_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x011, + VKD3D_SHADER_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x014, + VKD3D_SHADER_FILTER_MIN_MAG_MIP_LINEAR = 0x015, + VKD3D_SHADER_FILTER_ANISOTROPIC = 0x055, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x080, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x081, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x084, + VKD3D_SHADER_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x085, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x090, + VKD3D_SHADER_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x091, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x094, + VKD3D_SHADER_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x095, + VKD3D_SHADER_FILTER_COMPARISON_ANISOTROPIC = 0x0d5, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, + VKD3D_SHADER_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, + VKD3D_SHADER_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, + VKD3D_SHADER_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, + VKD3D_SHADER_FILTER_MINIMUM_ANISOTROPIC = 0x155, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, + VKD3D_SHADER_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, + VKD3D_SHADER_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; enum vkd3d_texture_address_mode @@ -403,7 +403,7 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { - enum vkd3d_filter filter; + enum vkd3d_shader_filter filter; enum vkd3d_texture_address_mode address_u; enum vkd3d_texture_address_mode address_v; enum vkd3d_texture_address_mode address_w; -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the vkd3d_root_descriptor structure to vkd3d_shader_root_descriptor.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0323766..b2c3dc9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -450,7 +450,7 @@ struct vkd3d_shader_root_constants unsigned int value_count; }; -struct vkd3d_root_descriptor +struct vkd3d_shader_root_descriptor { unsigned int shader_register; unsigned int register_space; @@ -474,7 +474,7 @@ struct vkd3d_root_parameter { struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor descriptor; + struct vkd3d_shader_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a247d5c..1fb8dc8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2376,7 +2376,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con } static int shader_parse_root_descriptor(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor *descriptor) { const char *ptr; @@ -2890,7 +2890,7 @@ static int shader_write_root_constants(struct root_signature_writer_context *con } static int shader_write_root_descriptor(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor *descriptor) + const struct vkd3d_shader_root_descriptor *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 6 +++--- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6fa2505..0323766 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -443,7 +443,7 @@ struct vkd3d_shader_root_descriptor_table const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; -struct vkd3d_root_constants +struct vkd3d_shader_root_constants { unsigned int shader_register; unsigned int register_space; @@ -473,7 +473,7 @@ struct vkd3d_root_parameter union { struct vkd3d_shader_root_descriptor_table descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; @@ -553,7 +553,7 @@ struct vkd3d_root_parameter1 union { struct vkd3d_root_descriptor_table1 descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor1 descriptor; } u; enum vkd3d_shader_visibility shader_visibility; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0848c04..a247d5c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2354,7 +2354,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context * } static int shader_parse_root_constants(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_constants *constants) + unsigned int offset, struct vkd3d_shader_root_constants *constants) { const char *ptr; @@ -2696,7 +2696,7 @@ static enum vkd3d_shader_visibility versioned_root_signature_get_parameter_shade return desc->u.v_1_1.parameters[i].shader_visibility; } -static const struct vkd3d_root_constants *versioned_root_signature_get_root_constants( +static const struct vkd3d_shader_root_constants *versioned_root_signature_get_root_constants( const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2877,7 +2877,7 @@ static int shader_write_descriptor_table1(struct root_signature_writer_context * } static int shader_write_root_constants(struct root_signature_writer_context *context, - const struct vkd3d_root_constants *constants) + const struct vkd3d_shader_root_constants *constants) { if (!write_dword(context, constants->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY; -- 2.11.0

1 0