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

Piotr Caban : msvcrt: Copy memchr implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 9d4eeaeb7773d00d51ff60de29e4be8f43209d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4eeaeb7773d00d51ff60de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:19 2020 +0200 msvcrt: Copy memchr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a654bb1dde..3a71dc97b0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2267,7 +2267,10 @@ char* __cdecl MSVCRT_strrchr(const char *str, int c) */ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) { - return memchr(ptr, c, n); + const unsigned char *p = ptr; + + for (p = ptr; n; n--, p++) if (*p == c) return (void *)(ULONG_PTR)p; + return NULL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy memcmp implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 773f0a835bf26b97416763720c8a0f1b2ded8094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773f0a835bf26b9741676372… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:22 2020 +0200 msvcrt: Copy memcmp implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3a71dc97b0..fe2cf6abe5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2219,7 +2219,14 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 */ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) { - return memcmp(ptr1, ptr2, n); + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy memmove implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: f02193738c88bea8fefb3f8d2e79c5e9941f6b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f02193738c88bea8fefb3f8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:26 2020 +0200 msvcrt: Copy memmove implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fe2cf6abe5..8612780722 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2230,19 +2230,32 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) } /********************************************************************* - * memcpy (MSVCRT.@) + * memmove (MSVCRT.@) */ -void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) +void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) { - return memmove(dst, src, n); + volatile unsigned char *d = dst; /* avoid gcc optimizations */ + const unsigned char *s = src; + + if ((MSVCRT_size_t)dst - (MSVCRT_size_t)src >= n) + { + while (n--) *d++ = *s++; + } + else + { + d += n - 1; + s += n - 1; + while (n--) *d-- = *s--; + } + return dst; } /********************************************************************* - * memmove (MSVCRT.@) + * memcpy (MSVCRT.@) */ -void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) +void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) { - return memmove(dst, src, n); + return MSVCRT_memmove(dst, src, n); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy memset implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 41a5da9b763c2d7009cdbc84cdcab0f7453fe13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a5da9b763c2d7009cdbc84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:28 2020 +0200 msvcrt: Copy memset implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8612780722..8842e0791e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2263,7 +2263,9 @@ void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n) */ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) { - return memset(dst, c, n); + volatile unsigned char *d = dst; /* avoid gcc optimizations */ + while (n--) *d++ = c; + return dst; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy strcat implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: f6763553660d3df7b0f8710476505bdd3cf389b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6763553660d3df7b0f87104… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:35 2020 +0200 msvcrt: Copy strcat implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 11 +++++++++++ dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index aae66d828c..dddc8a6bd1 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -463,7 +463,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 68d1ee3f0f..12699a71fa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1795,7 +1795,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 13abe6ad64..785baaef61 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2153,7 +2153,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7181184938..83daf454b6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2363,7 +2363,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index d4114a24fe..9e8c9020eb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -809,7 +809,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c1b1c68f1f..cd780ae7d9 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -805,7 +805,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 916245cb26..4a5e0875c2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1475,7 +1475,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b2967858bc..5401cd2a9c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1448,7 +1448,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51ecb095db..36284cf14a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1417,7 +1417,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8842e0791e..fe86f14f57 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1116,6 +1116,17 @@ int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) return MSVCRT_ERANGE; } +/********************************************************************* + * strcat (MSVCRT.@) + */ +char* __cdecl MSVCRT_strcat( char *dst, const char *src ) +{ + char *d = dst; + while (*d) d++; + while ((*d++ = *src++)); + return dst; +} + /********************************************************************* * strncat_s (MSVCRT.@) */ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 8c775c61a4..c8ed824adf 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -761,7 +761,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2577649421..6dc73d47fd 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2494,7 +2494,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand -@ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat(str str) MSVCRT_strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_desc1 structure to vkd3d_shader_root_signature_desc1.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: 823e356460d4e5dda5e73bf6fa6fb2000b3e7bdd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=823e356460d4e5dda5e73bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:11 2020 +0430 vkd3d-shader: Rename the vkd3d_root_signature_desc1 structure to vkd3d_shader_root_signature_desc1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a5a3498..3bd9ce5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -559,7 +559,7 @@ struct vkd3d_shader_root_parameter1 enum vkd3d_shader_visibility shader_visibility; }; -struct vkd3d_root_signature_desc1 +struct vkd3d_shader_root_signature_desc1 { unsigned int parameter_count; const struct vkd3d_shader_root_parameter1 *parameters; @@ -582,7 +582,7 @@ struct vkd3d_versioned_root_signature_desc union { struct vkd3d_shader_root_signature_desc v_1_0; - struct vkd3d_root_signature_desc1 v_1_1; + struct vkd3d_shader_root_signature_desc1 v_1_1; } u; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1be733a..dd57287 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2606,7 +2606,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, } else { - struct vkd3d_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; + struct vkd3d_shader_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; assert(version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1); @@ -3262,7 +3262,7 @@ fail: 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; + const struct vkd3d_shader_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_shader_root_signature_desc *dst_desc = &dst->u.v_1_0; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter *parameters = NULL; @@ -3384,7 +3384,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_ const struct vkd3d_versioned_root_signature_desc *src) { const struct vkd3d_shader_root_signature_desc *src_desc = &src->u.v_1_0; - struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; + struct vkd3d_shader_root_signature_desc1 *dst_desc = &dst->u.v_1_1; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter1 *parameters = NULL; int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 80dbda1..b40d2b4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -495,7 +495,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_shader_root_sign memset(root_signature, 0, sizeof(*root_signature)); } -static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_desc1 *root_signature) +static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_signature_desc1 *root_signature) { unsigned int i;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_versioned_root_signature_desc structure.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: 23416913f43c33ffef582af2f2b80886ff31d3a1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=23416913f43c33ffef582af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:12 2020 +0430 vkd3d-shader: Rename the vkd3d_versioned_root_signature_desc structure. To vkd3d_shader_versioned_root_signature_desc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 22 +++++++++--------- libs/vkd3d-shader/dxbc.c | 44 ++++++++++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_main.c | 16 ++++++------- libs/vkd3d/vkd3d_private.h | 2 +- tests/vkd3d_shader_api.c | 4 ++-- 7 files changed, 47 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=23416913f43c33ffef5…

1 0

Henri Verbeet : vkd3d-shader: Rename the VKD3D_DUMMY_SAMPLER_INDEX macro to VKD3D_SHADER_DUMMY_SAMPLER_INDEX.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: a196555513e82945d52ca45ed62e5ff8474f95ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a196555513e82945d52ca45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:13 2020 +0430 vkd3d-shader: Rename the VKD3D_DUMMY_SAMPLER_INDEX macro to VKD3D_SHADER_DUMMY_SAMPLER_INDEX. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 601f21f..2b1770f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -153,7 +153,7 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_descriptor_binding binding; }; -#define VKD3D_DUMMY_SAMPLER_INDEX ~0u +#define VKD3D_SHADER_DUMMY_SAMPLER_INDEX ~0u struct vkd3d_shader_combined_resource_sampler { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 94d7eff..bbfe701 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5250,7 +5250,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, current->sampler_index); - depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX + depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, @@ -5263,7 +5263,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); - if (current->sampler_index == VKD3D_DUMMY_SAMPLER_INDEX) + if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); else vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); @@ -7210,7 +7210,7 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru return NULL; resource_index = resource_reg->idx[0].offset; - sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_DUMMY_SAMPLER_INDEX; + sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_SHADER_DUMMY_SAMPLER_INDEX; vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); if ((entry = rb_get(&compiler->symbol_table, &key)))

1 0

Henri Verbeet : vkd3d-shader: Add missing VKD3D_FORCE_32_BIT_ENUM enum elements.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: 4906bd40c6f202f6a73eb5256f2e3a6c7ebc71f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4906bd40c6f202f6a73eb52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:14 2020 +0430 vkd3d-shader: Add missing VKD3D_FORCE_32_BIT_ENUM enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b1770f..f4a2be5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -103,18 +103,24 @@ enum vkd3d_shader_parameter_type VKD3D_SHADER_PARAMETER_TYPE_UNKNOWN, VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT, VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; enum vkd3d_shader_parameter_data_type { VKD3D_SHADER_PARAMETER_DATA_TYPE_UNKNOWN, VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_DATA_TYPE), }; enum vkd3d_shader_parameter_name { VKD3D_SHADER_PARAMETER_NAME_UNKNOWN, VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_NAME), }; struct vkd3d_shader_parameter_immediate_constant @@ -684,6 +690,8 @@ enum vkd3d_shader_minimum_precision VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_MINIMUM_PRECISION), }; struct vkd3d_shader_signature_element

1 0

Henri Verbeet : vkd3d-shader: Output point sizes.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: e7828d67826d2e70c371f977451cd4f908836ac7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e7828d67826d2e70c371f97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:15 2020 +0430 vkd3d-shader: Output point sizes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bbfe701..3ece044 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5615,6 +5615,19 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_primitive(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_point_size(struct vkd3d_dxbc_compiler *compiler) +{ + static const struct vkd3d_spirv_builtin point_size = {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInPointSize}; + + /* Set the point size. Point sprites are not supported in d3d10+, but + * point primitives can still be used with e.g. stream output. Vulkan + * requires the point size to always be explicitly defined when outputting + * points. */ + vkd3d_spirv_build_op_store(&compiler->spirv_builder, + vkd3d_dxbc_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0), + vkd3d_dxbc_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone); +} + static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5625,6 +5638,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compi { case VKD3D_PT_POINTLIST: mode = SpvExecutionModeOutputPoints; + vkd3d_dxbc_compiler_emit_point_size(compiler); break; case VKD3D_PT_LINESTRIP: mode = SpvExecutionModeOutputLineStrip; @@ -8406,6 +8420,10 @@ static void vkd3d_dxbc_compiler_emit_cut_stream(struct vkd3d_dxbc_compiler *comp static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *compiler) { vkd3d_dxbc_compiler_emit_push_constant_buffers(compiler); + + if (compiler->xfb_info && compiler->xfb_info->element_count + && compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + vkd3d_dxbc_compiler_emit_point_size(compiler); } static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx)

1 0