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

Alexandre Julliard : msvcrt: Add MSVCRT_ prefix to the spawn() functions.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: ac38c175b5c39c23aff7047786d529220d77fc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac38c175b5c39c23aff70477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 10:48:23 2019 +0200 msvcrt: Add MSVCRT_ prefix to the spawn() functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 24 ++++++++++++------------ dlls/msvcr110/msvcr110.spec | 24 ++++++++++++------------ dlls/msvcr120/msvcr120.spec | 24 ++++++++++++------------ dlls/msvcr70/msvcr70.spec | 24 ++++++++++++------------ dlls/msvcr71/msvcr71.spec | 24 ++++++++++++------------ dlls/msvcr80/msvcr80.spec | 24 ++++++++++++------------ dlls/msvcr90/msvcr90.spec | 24 ++++++++++++------------ dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ dlls/msvcrt/process.c | 24 ++++++++++++------------ dlls/msvcrtd/msvcrtd.spec | 24 ++++++++++++------------ dlls/ucrtbase/ucrtbase.spec | 24 ++++++++++++------------ 12 files changed, 138 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac38c175b5c39c23aff7…

1 0

Alexandre Julliard : msvcrt: Export an import symbol for __acrt_iob_func() for compatibility with Mingw.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: b360bf81cb1ca68ed86dbdcef67849e58440f16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b360bf81cb1ca68ed86dbdce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 15:54:00 2019 +0200 msvcrt: Export an import symbol for __acrt_iob_func() for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/iob.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index 53a7147..c02913b 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -34,3 +34,9 @@ MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) { return __p__iob() + idx; } + +#ifdef __i386__ +void *_imp____acrt_iob_func = __acrt_iob_func; +#else +void *__imp___acrt_iob_func = __acrt_iob_func; +#endif

1 0

Alexandre Julliard : msvcp: Define _vsnprintf().
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 4f1f95b1b3e25d302c2a0c4118ca303c649cc9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1f95b1b3e25d302c2a0c41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 16:47:01 2019 +0200 msvcp: Define _vsnprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 6 ++++++ dlls/vcruntime140/misc.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 7aef4cd..fbf4a79 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -136,6 +136,12 @@ int WINAPIV sprintf(char *buf, const char *fmt, ...) __ms_va_end(valist); return ret; } + +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +} #endif static void init_cxx_funcs(void) diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index cc64175..028bde5 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -22,6 +22,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); +#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) +int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, + _locale_t locale, __ms_va_list valist); + int* CDECL __processing_throw(void); /********************************************************************* @@ -54,3 +58,9 @@ int __cdecl __uncaught_exceptions(void) { return *__processing_throw(); } + +int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +}

1 0

Alexandre Julliard : libport: Don't hide the casemap and wctype tables.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: a37c38191ec096972119f2a57f46858a59588eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37c38191ec096972119f2a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 16:38:04 2019 +0200 libport: Don't hide the casemap and wctype tables. For libwine backwards compatibility. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/casemap.c | 4 ++-- libs/port/wctype.c | 2 +- tools/make_unicode | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/port/casemap.c b/libs/port/casemap.c index d440fce..1c975db 100644 --- a/libs/port/casemap.c +++ b/libs/port/casemap.c @@ -4,7 +4,7 @@ #include "wine/unicode.h" -const WCHAR DECLSPEC_HIDDEN wine_casemap_lower[4259] = +const WCHAR wine_casemap_lower[4259] = { /* index */ 0x01bf, 0x02bf, 0x03bf, 0x044f, 0x054f, 0x064f, 0x0100, 0x0100, @@ -562,7 +562,7 @@ const WCHAR DECLSPEC_HIDDEN wine_casemap_lower[4259] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const WCHAR DECLSPEC_HIDDEN wine_casemap_upper[4828] = +const WCHAR wine_casemap_upper[4828] = { /* index */ 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, diff --git a/libs/port/wctype.c b/libs/port/wctype.c index bb0eab5..4153cb8 100644 --- a/libs/port/wctype.c +++ b/libs/port/wctype.c @@ -3,7 +3,7 @@ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN wine_wctype_table[17152] = +const unsigned short wine_wctype_table[17152] = { /* offsets */ 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800, diff --git a/tools/make_unicode b/tools/make_unicode index 0f3cdcc..5060548 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1599,7 +1599,7 @@ sub dump_mirroring($) print OUTPUT "/* generated from $UNIDATA/BidiMirroring.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - dump_case_table( "wine_mirror_map", @mirror_table ); + dump_case_table( "DECLSPEC_HIDDEN wine_mirror_map", @mirror_table ); close OUTPUT; save_file($filename); } @@ -1757,9 +1757,9 @@ sub dump_digit_folding($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - dump_case_table( "wine_digitmap", @digitmap_table ); + dump_case_table( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); print OUTPUT "\n"; - dump_case_table( "wine_compatmap", @compatmap_table ); + dump_case_table( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); close OUTPUT; save_file($filename); } @@ -1836,7 +1836,7 @@ sub dump_case_table($@) # dump the table - printf OUTPUT "const WCHAR DECLSPEC_HIDDEN %s[%d] =\n", $name, $index * 256 + 512 - $removed; + printf OUTPUT "const WCHAR %s[%d] =\n", $name, $index * 256 + 512 - $removed; printf OUTPUT "{\n /* index */\n"; printf OUTPUT "%s,\n", DUMP_ARRAY( "0x%04x", 256, @filled ); printf OUTPUT " /* defaults */\n"; @@ -1892,7 +1892,7 @@ sub dump_simple_mapping($$@) my $def = shift; my @array = compress_array( 256, $def, @_[0..65535] ); - printf OUTPUT "const unsigned short DECLSPEC_HIDDEN %s[%d] =\n{\n", $name, $#array+1; + printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; printf OUTPUT " /* offsets */\n%s,\n", DUMP_ARRAY( "0x%04x", 0, @array[0..255] ); printf OUTPUT " /* values */\n%s\n};\n", DUMP_ARRAY( "0x%04x", 0, @array[256..$#array] ); }

1 0

Michael Müller : l3codeca.acm: Check input format in MPEG3_StreamOpen.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: wine Branch: master Commit: 99d4cdcf0b89c5fc03a60f503a434b46bf1367e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d4cdcf0b89c5fc03a60f50… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 1 01:37:31 2019 +0200 l3codeca.acm: Check input format in MPEG3_StreamOpen. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 15 ++++++++- dlls/msacm32/tests/msacm.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 8ad6ae8..2e92937 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -212,6 +212,7 @@ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) */ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { + LRESULT error = MMSYSERR_NOTSUPPORTED; AcmMpeg3Data* aad; int err; @@ -235,6 +236,18 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { + if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + { + MPEGLAYER3WAVEFORMAT *formatmp3 = (MPEGLAYER3WAVEFORMAT *)adsi->pwfxSrc; + + if (adsi->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES || + formatmp3->wID != MPEGLAYER3_ID_MPEG) + { + error = ACMERR_NOTPOSSIBLE; + goto theEnd; + } + } + /* resampling or mono <=> stereo not available * MPEG3 algo only define 16 bit per sample output */ @@ -270,7 +283,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) theEnd: HeapFree(GetProcessHeap(), 0, aad); adsi->dwDriver = 0L; - return MMSYSERR_NOTSUPPORTED; + return error; } /*********************************************************************** diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 180639f..04b4e09 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1276,6 +1276,88 @@ static void test_acmFormatChoose(void) HeapFree(GetProcessHeap(), 0, pwfx); } +static void test_mp3(void) +{ + MPEGLAYER3WAVEFORMAT src; + WAVEFORMATEX dst; + HACMSTREAM has; + DWORD output; + MMRESULT mr; + + src.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + src.wfx.nSamplesPerSec = 11025; + src.wfx.wBitsPerSample = 0; + src.wfx.nChannels = 1; + src.wfx.nBlockAlign = 576; + src.wfx.nAvgBytesPerSec = 2000; + + src.wID = MPEGLAYER3_ID_MPEG; + src.fdwFlags = 0; + src.nBlockSize = 576; + src.nFramesPerBlock = 1; + src.nCodecDelay = 0; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 11025; + dst.wBitsPerSample = 16; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + src.wfx.cbSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + src.wID = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wID = MPEGLAYER3_ID_MPEG; + src.nBlockSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } + src.nBlockSize = 576; + src.wfx.nAvgBytesPerSec = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + /* causes a division by zero exception in XP, Vista, + but throws ACMERR_NOTPOSSIBLE on others */ + if (0) acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } + + src.wfx.nAvgBytesPerSec = 2000; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR || broken(mr == ACMERR_NOTPOSSIBLE) /* Win 2008 */, + "failed with error 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) + { + mr = acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + } +} + static struct { struct @@ -1446,6 +1528,7 @@ START_TEST(msacm) test_acmFormatSuggest(); test_acmFormatTagDetails(); test_acmFormatChoose(); + test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd();

1 0

Józef Kucia : vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors().
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: 91e88a820e708804614203c834e0acac8a62c4d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91e88a820e708804614203c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:52 2019 +0200 vkd3d: Avoid copying empty ranges in d3d12_device_CopyDescriptors(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 34 ++++++++++++++++------------------ libs/vkd3d/resource.c | 2 ++ tests/d3d12.c | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8676434..9b18bc9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2306,29 +2306,27 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, } dst_range_idx = dst_idx = 0; - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[0]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[0] : 1; - for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) + src_range_idx = src_idx = 0; + while (dst_range_idx < dst_descriptor_range_count && src_range_idx < src_descriptor_range_count) { - src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); + dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; - for (src_idx = 0; src_idx < src_range_size; ++src_idx) - { - if (dst_idx >= dst_range_size) - { - dst_idx = 0; - ++dst_range_idx; - if (dst_range_idx >= dst_descriptor_range_count) - return; - - dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); - dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; - } + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); + src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); - d3d12_desc_copy(dst++, src++, device); + while (dst_idx < dst_range_size && src_idx < src_range_size) + d3d12_desc_copy(&dst[dst_idx++], &src[src_idx++], device); - ++dst_idx; + if (dst_idx >= dst_range_size) + { + ++dst_range_idx; + dst_idx = 0; + } + if (src_idx >= src_range_size) + { + ++src_range_idx; + src_idx = 0; } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a6c22fd..8485585 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1600,6 +1600,8 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { + assert(dst != src); + d3d12_desc_destroy(dst, device); *dst = *src; diff --git a/tests/d3d12.c b/tests/d3d12.c index a9255b3..79bca28 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15168,12 +15168,16 @@ static void test_copy_descriptors(void) dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9); dst_range_sizes[0] = 4; - dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 13); - dst_range_sizes[1] = 3; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 9); + dst_range_sizes[1] = 0; + dst_handles[2] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[2] = 3; + dst_handles[3] = get_cpu_descriptor_handle(&context, heap, 13); + dst_range_sizes[3] = 0; src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 10); - src_range_sizes[0] = 7; + src_range_sizes[0] = 8; /* t0-t6 */ - ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + ID3D12Device_CopyDescriptors(device, 4, dst_handles, dst_range_sizes, 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); /* copy 1 uninitialized descriptor (19) */ @@ -15195,6 +15199,28 @@ static void test_copy_descriptors(void) get_cpu_descriptor_handle(&context, cpu_heap, 22), D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + /* range sizes equal to 0 */ + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 0; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 0; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 1; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 4; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[0] = 4; + dst_handles[1] = get_cpu_descriptor_handle(&context, heap, 19); + dst_range_sizes[1] = 4; + src_handles[0] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[0] = 0; + src_handles[1] = get_cpu_descriptor_handle(&context, cpu_heap, 0); + src_range_sizes[1] = 0; + ID3D12Device_CopyDescriptors(device, 2, dst_handles, dst_range_sizes, + 2, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); heaps[0] = sampler_heap; heaps[1] = heap; ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps);

1 0

Józef Kucia : tests: Add test for updating descriptor tables after changing root signature.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: ba1766fe307750a630e7241e2a9c2afc3bf21f69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ba1766fe307750a630e7241… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:53 2019 +0200 tests: Add test for updating descriptor tables after changing root signature. This test is for commit 74fbfee61101901666069f1f7e868e0205266c10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ba1766fe307750a630e…

1 0

Józef Kucia : test: Test root CBV descriptor with big buffer.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: e88d6f4f2a7ad1b7d7b3b8ed9f5ab02c8b5ab018 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e88d6f4f2a7ad1b7d7b3b8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:54 2019 +0200 test: Test root CBV descriptor with big buffer. This test is for commit 22330b541446b62f10ef7d03dff709318420757a. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9a17a71..00005c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10477,6 +10477,7 @@ static void test_immediate_constant_buffer(void) 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, }; + static const unsigned int MAX_CB_SIZE = D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT * sizeof(struct vec4); static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; static struct vec4 expected_result[] = { @@ -10501,7 +10502,7 @@ static void test_immediate_constant_buffer(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps, NULL); - cb = create_upload_buffer(context.device, sizeof(index), NULL); + cb = create_upload_buffer(context.device, 2 * MAX_CB_SIZE, NULL); for (i = 0; i < ARRAY_SIZE(expected_result); ++i) {

1 0

Józef Kucia : tests: Use vkd3d_optional_device_extensions_info.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: 0eb2817c226b2694ff1a07aba136a8664de8f47b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0eb2817c226b2694ff1a07a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:55 2019 +0200 tests: Use vkd3d_optional_device_extensions_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 723659e..2103caf 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -455,29 +455,30 @@ static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance) static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { - struct vkd3d_device_create_info device_create_info; - VkPhysicalDevice vk_physical_device; - static const char * const device_extensions[] = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, }; + static const struct vkd3d_optional_device_extensions_info optional_extensions = + { + .type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + .extensions = device_extensions, + .extension_count = ARRAY_SIZE(device_extensions), + }; + + struct vkd3d_device_create_info device_create_info; + VkPhysicalDevice vk_physical_device; if (!(vk_physical_device = select_physical_device(instance))) return E_INVALIDARG; memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = &optional_extensions; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.vk_physical_device = vk_physical_device; - if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) - { - device_create_info.device_extensions = device_extensions; - device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); - } - return vkd3d_create_device(&device_create_info, iid, device); }

1 0

Józef Kucia : vkd3d: Enable VK_EXT_descriptor_indexing.
by Alexandre Julliard 02 Apr '19

02 Apr '19

Module: vkd3d Branch: master Commit: a1ec97ca2aaba36650870f847bf08781aeed6723 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1ec97ca2aaba36650870f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 2 12:15:56 2019 +0200 vkd3d: Enable VK_EXT_descriptor_indexing. This extension brings dynamic indexing for all descriptor types and the update after bind feature. VK_KHR_maintenance3 is required by VK_EXT_descriptor_indexing. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 2 + libs/vkd3d/vulkan_procs.h | 3 + 3 files changed, 168 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a1ec97ca2aaba366508…

1 0