January 2019 - Wine-commits

Hans Leidekker : wbemprox: Support cpuid on 64-bit.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 48554a2645b873b43cdbe7a70aec2b47080a7476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48554a2645b873b43cdbe7a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:10 2019 +0100 wbemprox: Support cpuid on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d3efd99..7893aa1 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2804,21 +2804,44 @@ done: return status; } -static inline void do_cpuid( unsigned int ax, unsigned int *p ) -{ -#ifdef __i386__ -#ifdef _MSC_VER - __cpuid(p, ax); +extern void do_cpuid( unsigned int ax, unsigned int *p ); +#if defined(_MSC_VER) +void do_cpuid( unsigned int ax, unsigned int *p ) +{ + __cpuid( p, ax ); +} +#elif defined(__i386__) +__ASM_GLOBAL_FUNC( do_cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rbx\n\t" + "movl %edi,%eax\n\t" + "cpuid\n\t" + "movl %eax,(%rsi)\n\t" + "movl %ebx,4(%rsi)\n\t" + "movl %ecx,8(%rsi)\n\t" + "movl %edx,12(%rsi)\n\t" + "popq %rbx\n\t" + "ret" ) #else - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif -#endif +void do_cpuid( unsigned int ax, unsigned int *p ) +{ + FIXME("\n"); } +#endif + static const WCHAR *get_osarchitecture(void) { SYSTEM_INFO info;

1 0

Hans Leidekker : wbemprox: Strip trailing spaces from processor name.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: d1f70b17e6e3d8c53be7ca3453719b87b66d7598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f70b17e6e3d8c53be7ca34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:11 2019 +0100 wbemprox: Strip trailing spaces from processor name. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7893aa1..87cdc0a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2907,6 +2907,7 @@ static void get_processor_manufacturer( WCHAR *manufacturer ) static void get_processor_name( WCHAR *name ) { unsigned int regs[4] = {0, 0, 0, 0}; + int i; do_cpuid( 0x80000000, regs ); if (regs[0] >= 0x80000004) @@ -2918,6 +2919,7 @@ static void get_processor_name( WCHAR *name ) do_cpuid( 0x80000004, regs ); regs_to_str( regs, 16, name + 32 ); } + for (i = strlenW(name) - 1; i >= 0 && name[i] == ' '; i--) name[i] = 0; } static UINT get_processor_currentclockspeed( UINT index ) {

1 0

Hans Leidekker : wbemprox: Include extended model and family fields in processor properties.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: dfb0c8c951ec2349a17ef228c39862ced8148f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb0c8c951ec2349a17ef228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:12 2019 +0100 wbemprox: Include extended model and family fields in processor properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 87cdc0a..620d64e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2849,6 +2849,20 @@ static const WCHAR *get_osarchitecture(void) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; return os_32bitW; } +static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) +{ + unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; + + model = (reg0 & (0x0f << 4)) >> 4; + if (family_id == 6 || family_id == 15) model |= (reg0 & (0x0f << 16)) >> 12; + if (family) + { + *family = family_id; + if (family_id == 15) *family += (reg0 & (0xff << 20)) >> 20; + } + *stepping = reg0 & 0x0f; + return model; +} static void get_processor_caption( WCHAR *caption ) { static const WCHAR fmtW[] = @@ -2857,19 +2871,23 @@ static void get_processor_caption( WCHAR *caption ) static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; - unsigned int regs[4] = {0, 0, 0, 0}; + unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; do_cpuid( 1, regs ); - sprintfW( caption, fmtW, arch, (regs[0] & (15 << 8)) >> 8, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); + + model = get_processor_model( regs[0], &stepping, &family ); + sprintfW( caption, fmtW, arch, family, model, stepping ); } static void get_processor_version( WCHAR *version ) { static const WCHAR fmtW[] = {'M','o','d','e','l',' ','%','u',',',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; - unsigned int regs[4] = {0, 0, 0, 0}; + unsigned int regs[4] = {0, 0, 0, 0}, model, stepping; do_cpuid( 1, regs ); - sprintfW( version, fmtW, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); + + model = get_processor_model( regs[0], &stepping, NULL ); + sprintfW( version, fmtW, model, stepping ); } static UINT16 get_processor_revision(void) {

1 0

Hans Leidekker : wbemprox: Fix processor caption on AMD 64-bit.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: f2e1c51422084066ae0b72a8e5f0043101e1344f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e1c51422084066ae0b72a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:13 2019 +0100 wbemprox: Fix processor caption on AMD 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 62 +++++++++++++++++++++++++-------------------- dlls/wbemprox/tests/query.c | 11 ++++++++ 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 620d64e..03f6e62 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2842,13 +2842,6 @@ void do_cpuid( unsigned int ax, unsigned int *p ) } #endif -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) { unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; @@ -2863,6 +2856,32 @@ static unsigned int get_processor_model( unsigned int reg0, unsigned int *steppi *stepping = reg0 & 0x0f; return model; } +static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +{ + unsigned int i; + unsigned char *p = (unsigned char *)regs; + + for (i = 0; i < len; i++) { buffer[i] = *p++; } + buffer[i] = 0; +} +static void get_processor_manufacturer( WCHAR *manufacturer ) +{ + unsigned int tmp, regs[4] = {0, 0, 0, 0}; + + do_cpuid( 0, regs ); + tmp = regs[2]; /* swap edx and ecx */ + regs[2] = regs[3]; + regs[3] = tmp; + + regs_to_str( regs + 1, 12, manufacturer ); +} +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} static void get_processor_caption( WCHAR *caption ) { static const WCHAR fmtW[] = @@ -2870,9 +2889,17 @@ static void get_processor_caption( WCHAR *caption ) 'M','o','d','e','l',' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; - const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; + static const WCHAR amd64W[] = {'A','M','D','6','4',0}; + static const WCHAR authenticamdW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; + const WCHAR *arch; + WCHAR manufacturer[13]; unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + get_processor_manufacturer( manufacturer ); + if (get_osarchitecture() == os_32bitW) arch = x86W; + else if (!strcmpW( manufacturer, authenticamdW )) arch = amd64W; + else arch = intel64W; + do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, &family ); @@ -2903,25 +2930,6 @@ static void get_processor_id( WCHAR *processor_id ) do_cpuid( 1, regs ); sprintfW( processor_id, fmtW, regs[3], regs[0] ); } -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) -{ - unsigned int i; - unsigned char *p = (unsigned char *)regs; - - for (i = 0; i < len; i++) { buffer[i] = *p++; } - buffer[i] = 0; -} -static void get_processor_manufacturer( WCHAR *manufacturer ) -{ - unsigned int tmp, regs[4] = {0, 0, 0, 0}; - - do_cpuid( 0, regs ); - tmp = regs[2]; /* swap edx and ecx */ - regs[2] = regs[3]; - regs[3] = tmp; - - regs_to_str( regs + 1, 12, manufacturer ); -} static void get_processor_name( WCHAR *name ) { unsigned int regs[4] = {0, 0, 0, 0}; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0fa6b5e..82195eb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1553,6 +1553,8 @@ static void test_Win32_Processor( IWbemServices *services ) { static const WCHAR architectureW[] = {'A','r','c','h','i','t','e','c','t','u','r','e',0}; + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; static const WCHAR levelW[] = @@ -1588,6 +1590,15 @@ static void test_Win32_Processor( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, architectureW, 0, &val, &type, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) );

1 0

Hans Leidekker : wbemprox: Create one processor object per package.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: cee89865294fc1d419d67cac4052ce0815731ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee89865294fc1d419d67cac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:14 2019 +0100 wbemprox: Create one processor object per package. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 61 ++++++++++++++++++++++++------------------- dlls/wbemprox/tests/query.c | 63 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee89865294fc1d419d6…

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b37c1d83e497b71f676b9c481dc374f8c4d6ab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37c1d83e497b71f676b9c48… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Jan 23 05:47:40 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 156 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 75 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b37c1d83e497b71f676b…

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoReleaseCancelSpinLock().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: e834d38c77d0c62ac882eadb83b6761f62a205d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e834d38c77d0c62ac882eadb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:21 2019 -0600 ntoskrnl.exe: Implement IoReleaseCancelSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/Makefile.in | 1 + dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ---------- dlls/ntoskrnl.exe/sync.c | 11 +++++++++++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index 8efaf55..cc2620e 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,4 +1,5 @@ MODULE = hal.dll +IMPORTLIB = hal C_SRCS = \ hal.c diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 8cafaad..3861d26 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,6 +1,6 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl -IMPORTS = advapi32 +IMPORTS = advapi32 hal DELAYIMPORTS = setupapi user32 C_SRCS = \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a48b9e3..2a061f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -785,16 +785,6 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) FIXME("(%p): stub\n", irql); } - -/*********************************************************************** - * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI IoReleaseCancelSpinLock(KIRQL irql) -{ - FIXME("(%u): stub\n", irql); -} - - /*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 74e84a6..36282fe 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -413,3 +413,14 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) return 0; } #endif + +static KSPIN_LOCK cancel_lock; + +/*********************************************************************** + * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseCancelSpinLock( KIRQL irql ) +{ + TRACE("irql %u.\n", irql); + KeReleaseSpinLock( &cancel_lock, irql ); +}

1 0

Józef Kucia : vkd3d: Return hardcoded GPU virtual address support.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: 766361f9c3dd4d56e05da4cc8eb44eff2f466ea6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=766361f9c3dd4d56e05da4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:31 2019 +0100 vkd3d: Return hardcoded GPU virtual address support. The hardcoded value makes a real app happy and it is close to values returned by various Windows drivers (AMD, Intel, Nvidia). In the long term, we might try to derive the values from maxResourceSize and/or sparseAddressSpaceSize. 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> --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/device.c | 16 ++++++++++++++++ tests/d3d12.c | 19 +++++++++++++++---- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index c025dbe..754bba3 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1535,6 +1535,12 @@ typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE D3D_ROOT_SIGNATURE_VERSION HighestVersion; } D3D12_FEATURE_DATA_ROOT_SIGNATURE; +typedef struct D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT +{ + UINT MaxGPUVirtualAddressBitsPerResource; + UINT MaxGPUVirtualAddressBitsPerProcess; +} D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT; + typedef enum D3D_SHADER_MODEL { D3D_SHADER_MODEL_5_1 = 0x51, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 93af06c..709c61f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1840,6 +1840,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: + { + D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + FIXME("Returning 40 GPU virtual address bits.\n"); + data->MaxGPUVirtualAddressBitsPerResource = 40; + data->MaxGPUVirtualAddressBitsPerProcess = 40; + return S_OK; + } + case D3D12_FEATURE_SHADER_MODEL: { D3D12_FEATURE_DATA_SHADER_MODEL *data = feature_data; diff --git a/tests/d3d12.c b/tests/d3d12.c index 26a2162..4af52a5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -962,6 +962,7 @@ static void test_node_count(void) static void test_check_feature_support(void) { + D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT gpu_virtual_address; D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; @@ -1038,7 +1039,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); trace("Max supported feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); max_supported_feature_level = feature_levels.MaxSupportedFeatureLevel; @@ -1047,7 +1048,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == max_supported_feature_level, "Got unexpected feature level %#x, expected %#x.\n", feature_levels.MaxSupportedFeatureLevel, max_supported_feature_level); @@ -1065,7 +1066,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == D3D_FEATURE_LEVEL_9_3, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); @@ -1074,10 +1075,20 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == 0x3000, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); + /* GPU virtual address */ + memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address)); + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, + &gpu_virtual_address, sizeof(gpu_virtual_address)); + ok(hr == S_OK, "Failed to check GPU virtual address support, hr %#x.\n", hr); + trace("GPU virtual address bits per resource: %u.\n", + gpu_virtual_address.MaxGPUVirtualAddressBitsPerResource); + trace("GPU virtual address bits per process: %u.\n", + gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Józef Kucia : vkd3d: Implement D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: 9370929ac16b4f65d35b044fae00b467ce9254c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9370929ac16b4f65d35b044… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:32 2019 +0100 vkd3d: Implement D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS. 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> --- include/vkd3d_d3d12.idl | 14 +++++++++ libs/vkd3d/device.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 18 ++++++++--- libs/vkd3d/vkd3d_private.h | 1 + 4 files changed, 104 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 754bba3..8b2e70f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -269,6 +269,20 @@ typedef struct D3D12_FEATURE_DATA_FORMAT_SUPPORT D3D12_FORMAT_SUPPORT2 Support2; } D3D12_FEATURE_DATA_FORMAT_SUPPORT; +typedef enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS +{ + D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0x00000000, + D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE = 0x00000001, +} D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS; + +typedef struct D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS +{ + DXGI_FORMAT Format; + UINT SampleCount; + D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS Flags; + UINT NumQualityLevels; +} D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS; + typedef enum D3D12_HEAP_TYPE { D3D12_HEAP_TYPE_DEFAULT = 1, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 709c61f..64c8391 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1687,6 +1687,68 @@ static void vkd3d_restrict_format_support_for_feature_level(D3D12_FEATURE_DATA_F } } +static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device *device, + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS *data) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkImageFormatProperties vk_properties; + const struct vkd3d_format *format; + VkSampleCountFlagBits vk_samples; + VkImageUsageFlags vk_usage = 0; + VkResult vr; + + TRACE("Format %#x, sample count %u, flags %#x.\n", data->Format, data->SampleCount, data->Flags); + + data->NumQualityLevels = 0; + + if (!(vk_samples = vk_samples_from_sample_count(data->SampleCount))) + WARN("Invalid sample count %u.\n", data->SampleCount); + if (!data->SampleCount) + return E_FAIL; + + if (data->SampleCount == 1) + { + data->NumQualityLevels = 1; + goto done; + } + + if (data->Format == DXGI_FORMAT_UNKNOWN) + goto done; + + if (!(format = vkd3d_get_format(data->Format, false))) + { + FIXME("Unhandled format %#x.\n", data->Format); + return E_INVALIDARG; + } + if (data->Flags) + FIXME("Ignoring flags %#x.\n", data->Flags); + + if (format->vk_aspect_mask & VK_IMAGE_ASPECT_COLOR_BIT) + vk_usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + else + vk_usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + + vr = VK_CALL(vkGetPhysicalDeviceImageFormatProperties(device->vk_physical_device, + format->vk_format, VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, vk_usage, 0, &vk_properties)); + if (vr == VK_ERROR_FORMAT_NOT_SUPPORTED) + { + WARN("Format %#x is not supported.\n", format->dxgi_format); + goto done; + } + if (vr < 0) + { + ERR("Failed to get image format properties, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + if (vk_properties.sampleCounts & vk_samples) + data->NumQualityLevels = 1; + +done: + TRACE("Returning %u quality levels.\n", data->NumQualityLevels); + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1840,6 +1902,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS: + { + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + return d3d12_device_check_multisample_quality_levels(device, data); + } + case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: { D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT *data = feature_data; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 016d050..75a5201 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -437,9 +437,9 @@ static VkImageType vk_image_type_from_d3d12_resource_dimension(D3D12_RESOURCE_DI } } -VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) { - switch (desc->Count) + switch (sample_count) { case 1: return VK_SAMPLE_COUNT_1_BIT; @@ -456,11 +456,21 @@ VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *d case 64: return VK_SAMPLE_COUNT_64_BIT; default: - FIXME("Unhandled sample count %u.\n", desc->Count); - return VK_SAMPLE_COUNT_1_BIT; + return 0; } } +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) +{ + VkSampleCountFlagBits vk_samples; + + if ((vk_samples = vk_samples_from_sample_count(desc->Count))) + return vk_samples; + + FIXME("Unhandled sample count %u.\n", desc->Count); + return VK_SAMPLE_COUNT_1_BIT; +} + HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6b35dc0..73825bb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -974,6 +974,7 @@ static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D1 VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN;

1 0

Józef Kucia : tests: Add test for D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: fd4f0b0024218ec8df78bd3090f137a0b33bfec6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd4f0b0024218ec8df78bd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:33 2019 +0100 tests: Add test for D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS. 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 | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4af52a5..2121473 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1151,6 +1151,126 @@ static void test_format_support(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_multisample_quality_levels(void) +{ + static const unsigned int sample_counts[] = {1, 2, 4, 8, 16, 32}; + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS format_support; + ID3D12Device *device; + DXGI_FORMAT format; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + memset(&format_support, 0, sizeof(format_support)); + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + /* 1 sample */ + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + if (format == DXGI_FORMAT_R1_UNORM) + continue; + + vkd3d_test_set_context("format %#x", format); + + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = format; + format_support.SampleCount = 1; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(format_support.NumQualityLevels == 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* DXGI_FORMAT_UNKNOWN */ + for (i = 1; i < ARRAY_SIZE(sample_counts); ++i) + { + vkd3d_test_set_context("samples %#x", sample_counts[i]); + + memset(&format_support, 0, sizeof(format_support)); + format_support.SampleCount = sample_counts[i]; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + format_support.Flags = D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(format_support.Flags == D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE, + "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* invalid sample counts */ + for (i = 1; i <= 32; ++i) + { + BOOL valid_sample_count = FALSE; + for (j = 0; j < ARRAY_SIZE(sample_counts); ++j) + { + if (sample_counts[j] == i) + { + valid_sample_count = TRUE; + break; + } + } + if (valid_sample_count) + continue; + + vkd3d_test_set_context("samples %#x", i); + + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.SampleCount = i; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* DXGI_FORMAT_R8G8B8A8_UNORM */ + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.SampleCount = 4; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_command_allocator(void) { ID3D12CommandAllocator *command_allocator; @@ -23902,6 +24022,7 @@ START_TEST(d3d12) run_test(test_node_count); run_test(test_check_feature_support); run_test(test_format_support); + run_test(test_multisample_quality_levels); run_test(test_create_command_allocator); run_test(test_create_command_list); run_test(test_create_command_queue);

1 0