wine-commits February 2024

1 participants
716 discussions

Conor McCarthy : tests/d3d12: Add tests for GetResourceAllocationInfo1().

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 67b4ae658a12fb2690dd5f93a92113699e0fc69b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/67b4ae658a12fb2690dd5f93a9211… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 11:37:43 2024 +1000 tests/d3d12: Add tests for GetResourceAllocationInfo1(). --- tests/d3d12.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f0dba3c7..58bd2129 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32137,6 +32137,7 @@ static void test_resource_allocation_info(void) { D3D12_RESOURCE_ALLOCATION_INFO info; D3D12_RESOURCE_DESC desc; + ID3D12Device4 *device4; ID3D12Device *device; uint64_t total = 0; unsigned int i, j; @@ -32185,7 +32186,9 @@ static void test_resource_allocation_info(void) {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; + D3D12_RESOURCE_ALLOCATION_INFO1 infos1[ARRAY_SIZE(texture_tests)] = {0}; D3D12_RESOURCE_DESC desc_array[ARRAY_SIZE(texture_tests)]; + uint64_t sizes[ARRAY_SIZE(texture_tests)]; if (!(device = create_device())) { @@ -32252,7 +32255,10 @@ static void test_resource_allocation_info(void) "Got unexpected alignment %"PRIu64".\n", info.Alignment); check_alignment(info.SizeInBytes, info.Alignment); if (i >= 6) + { total += info.SizeInBytes; + sizes[i] = info.SizeInBytes; + } desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); @@ -32262,6 +32268,7 @@ static void test_resource_allocation_info(void) { check_alignment(info.SizeInBytes, info.Alignment); total += info.SizeInBytes; + sizes[i] = info.SizeInBytes; } else { @@ -32289,6 +32296,36 @@ static void test_resource_allocation_info(void) check_alignment(info.SizeInBytes, info.Alignment); ok(info.SizeInBytes >= total, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device4, (void **)&device4))) + { + ID3D12Device4_GetResourceAllocationInfo1(device4, 0, ARRAY_SIZE(desc_array), desc_array, infos1); + ok(!infos1[0].Offset, "Got unexpected offset %"PRIu64".\n", infos1[0].Offset); + + for (i = 0; i < ARRAY_SIZE(infos1); ++i) + { + vkd3d_test_push_context("Test %u", i); + + todo + ok(infos1[i].Alignment >= desc_array[i].Alignment, + "Got unexpected alignment %"PRIu64".\n", infos1[i].Alignment); + check_alignment(infos1[i].Offset, infos1[i].Alignment); + check_alignment(infos1[i].SizeInBytes, infos1[i].Alignment); + todo + ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes); + + if (!i) + continue; + + ok(infos1[i].Offset - infos1[i - 1].Offset >= infos1[i - 1].SizeInBytes, + "Got unexpected prev size %"PRIu64", prev offset %"PRIu64", offset %"PRIu64".\n", + infos1[i - 1].SizeInBytes, infos1[i - 1].Offset, infos1[i].Offset); + + vkd3d_test_pop_context(); + } + + ID3D12Device4_Release(device4); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

3 months, 2 weeks

Conor McCarthy : vkd3d: Support multiple descriptions in GetResourceAllocationInfo().

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 7e84421b9c0468b31fb76ec8459c4e7cb277e97d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e84421b9c0468b31fb76ec8459c4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 00:27:54 2024 +1000 vkd3d: Support multiple descriptions in GetResourceAllocationInfo(). --- libs/vkd3d/device.c | 118 +++++++++++++++++++++++++-------------------- libs/vkd3d/resource.c | 6 +-- libs/vkd3d/vkd3d_private.h | 9 +++- tests/d3d12.c | 2 - 4 files changed, 77 insertions(+), 58 deletions(-)

3 months, 2 weeks

Conor McCarthy : tests/d3d12: Test multiple descriptions in test_resource_allocation_info().

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 8d0331df6c0d705956cc74e400240a7f86c88449 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d0331df6c0d705956cc74e400240… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 00:29:06 2024 +1000 tests/d3d12: Test multiple descriptions in test_resource_allocation_info(). --- tests/d3d12.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5172dd71..e9bda25c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32138,6 +32138,7 @@ static void test_resource_allocation_info(void) D3D12_RESOURCE_ALLOCATION_INFO info; D3D12_RESOURCE_DESC desc; ID3D12Device *device; + uint64_t total = 0; unsigned int i, j; ULONG refcount; @@ -32184,6 +32185,7 @@ static void test_resource_allocation_info(void) {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; + D3D12_RESOURCE_DESC desc_array[ARRAY_SIZE(texture_tests)]; if (!(device = create_device())) { @@ -32249,6 +32251,8 @@ static void test_resource_allocation_info(void) ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); check_alignment(info.SizeInBytes, info.Alignment); + if (i >= 6) + total += info.SizeInBytes; desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); @@ -32257,6 +32261,7 @@ static void test_resource_allocation_info(void) if (i < 6) { check_alignment(info.SizeInBytes, info.Alignment); + total += info.SizeInBytes; } else { @@ -32267,6 +32272,25 @@ static void test_resource_allocation_info(void) } } + for (i = 0; i < ARRAY_SIZE(texture_tests); ++i) + { + desc_array[i] = desc; + desc_array[i].Width = texture_tests[i].width; + desc_array[i].Height = texture_tests[i].height; + desc_array[i].DepthOrArraySize = texture_tests[i].array_size; + desc_array[i].MipLevels = texture_tests[i].miplevels; + desc_array[i].Format = texture_tests[i].format; + desc_array[i].Alignment = (i < 6) ? D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + } + info = ID3D12Device_GetResourceAllocationInfo(device, 0, ARRAY_SIZE(desc_array), desc_array); + todo + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + todo + ok(info.SizeInBytes >= total, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

3 months, 2 weeks

Conor McCarthy : vkd3d: Add ID3D12Device7 interface stubs.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 92e19a7da36a81f895ad03d6671d777b9a3d6cf9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/92e19a7da36a81f895ad03d6671d7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 30 15:46:29 2024 +1000 vkd3d: Add ID3D12Device7 interface stubs. --- libs/vkd3d/device.c | 258 ++++++++++++++++++++++++--------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +-- 4 files changed, 149 insertions(+), 127 deletions(-)

3 months, 2 weeks

Conor McCarthy : vkd3d: Add ID3D12Device6 interface stub.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 76fbbe980a66283d284e4671a79663c71b52837a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76fbbe980a66283d284e4671a7966… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 7 14:35:36 2023 +1000 vkd3d: Add ID3D12Device6 interface stub. --- libs/vkd3d/device.c | 247 ++++++++++++++++++++++++--------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +-- 4 files changed, 139 insertions(+), 126 deletions(-)

3 months, 2 weeks

Conor McCarthy : vkd3d-shader/spirv: Emit a vector bitcast if necessary in spirv_compiler_emit_load_ssa_reg().

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 95e4222cc65a23d842245a38fb6b0cb46cffcf04 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/95e4222cc65a23d842245a38fb6b0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 25 13:32:29 2024 +1000 vkd3d-shader/spirv: Emit a vector bitcast if necessary in spirv_compiler_emit_load_ssa_reg(). --- libs/vkd3d-shader/spirv.c | 11 ++++++++++- tests/hlsl/texture-load-typed.shader_test | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 755758ce..d4333e6d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3884,9 +3884,10 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler } assert(vkd3d_swizzle_is_scalar(swizzle, reg)); + reg_component_type = vkd3d_component_type_from_data_type(ssa->data_type); + if (reg->dimension == VSIR_DIMENSION_SCALAR) { - reg_component_type = vkd3d_component_type_from_data_type(ssa->data_type); if (component_type != reg_component_type) { type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); @@ -3896,6 +3897,14 @@ static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler return val_id; } + if (component_type != reg_component_type) + { + /* Required for resource loads with sampled type int, because DXIL has no signedness. + * Only 128-bit vector sizes are used. */ + type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); component_idx = vsir_swizzle_get_component(swizzle, 0); return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test index 67a13f10..736b4ae1 100644 --- a/tests/hlsl/texture-load-typed.shader_test +++ b/tests/hlsl/texture-load-typed.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe all rgba (0.8, -3.0, 4294967295.0, 123.0) % lowercase 'texture2D'

3 months, 2 weeks

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic TextureLoad.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: ebec0aa43480fb183c1c102bcc90f910de557f16 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebec0aa43480fb183c1c102bcc90f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jan 25 13:28:46 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic TextureLoad. --- libs/vkd3d-shader/dxil.c | 155 ++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 10 -- libs/vkd3d-shader/vkd3d_shader_private.h | 10 ++ tests/hlsl/cbuffer.shader_test | 4 +- tests/hlsl/initializer-objects.shader_test | 4 +- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/object-references.shader_test | 4 +- .../register-reservations-resources.shader_test | 32 +++-- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/texture-load-offset.shader_test | 4 +- tests/hlsl/texture-load.shader_test | 6 +- 11 files changed, 204 insertions(+), 37 deletions(-)

3 months, 2 weeks

Louis Lenders : shcore: Add stub for RegisterScaleChangeNotifications.

by Alexandre Julliard

Module: wine Branch: master Commit: c3918f2a82fd67301cf5fe1b35894506a34a2135 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3918f2a82fd67301cf5fe1b358945… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 1 21:15:39 2024 +0100 shcore: Add stub for RegisterScaleChangeNotifications. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56244 --- dlls/shcore/main.c | 12 ++++++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 653694a04dc..a64b6661d23 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2531,6 +2531,18 @@ HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) return E_NOTIMPL; } +/************************************************************************* + * RegisterScaleChangeNotifications [SHCORE.@] + */ +HRESULT WINAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE display_device, HWND hwnd, UINT msg, DWORD *cookie) +{ + FIXME("(%d, %p, %u, %p) stub\n", display_device, hwnd, msg, cookie); + + if (cookie) *cookie = 0; + + return E_NOTIMPL; +} + /************************************************************************* * CreateRandomAccessStreamOverStream [SHCORE.@] */ diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index fc265d8215a..102e3014bce 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -33,7 +33,7 @@ # @ stub RecordFeatureError # @ stub RecordFeatureUsage @ stdcall RegisterScaleChangeEvent(ptr ptr) -@ stub RegisterScaleChangeNotifications +@ stdcall RegisterScaleChangeNotifications(long ptr long ptr) @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long) @ stdcall SHAnsiToUnicode(str ptr long) diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 4689d83e7d9..147195d2cba 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -46,6 +46,7 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); +HRESULT WINAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE,HWND,UINT,DWORD*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); #endif /* __WINE_SHELLSCALINGAPI_H */

3 months, 2 weeks

Nikolay Sivov : d3d10/effect: Clarify constant buffer flags field meaning.

by Alexandre Julliard

Module: wine Branch: master Commit: 68ab4c48493f2a777f011f6d8e391de720c98109 URL: https://gitlab.winehq.org/wine/wine/-/commit/68ab4c48493f2a777f011f6d8e391d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 14:21:23 2024 +0100 d3d10/effect: Clarify constant buffer flags field meaning. It makes more sense to have it matching fx_5_0 format, which uses the same flag for TBUFFER case, and also keeps 'single' modifier in there. This modifier is ignored on fx_4_x, so it's only needed to be implemented in the compiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 534eadb2659..26394510945 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3796,10 +3796,13 @@ static HRESULT create_buffer_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char **ptr, BOOL local, struct d3d10_effect_variable *l) { + enum buffer_flags + { + IS_TBUFFER = 1, + }; const char *prefix = local ? "Local" : "Shared"; + uint32_t offset, flags; unsigned int i; - uint32_t offset; - D3D10_CBUFFER_TYPE d3d10_cbuffer_type; HRESULT hr; unsigned int stride = 0; @@ -3826,32 +3829,30 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->data_size = read_u32(ptr); TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); - d3d10_cbuffer_type = read_u32(ptr); - TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); + flags = read_u32(ptr); + TRACE("%s buffer flags: %#x.\n", prefix, flags); - switch(d3d10_cbuffer_type) + if (flags & IS_TBUFFER) { - case D3D10_CT_CBUFFER: - l->type->basetype = D3D10_SVT_CBUFFER; - if (!copy_name("cbuffer", &l->type->name)) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - break; - - case D3D10_CT_TBUFFER: - l->type->basetype = D3D10_SVT_TBUFFER; - if (!copy_name("tbuffer", &l->type->name)) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - break; + l->type->basetype = D3D10_SVT_TBUFFER; + copy_name("tbuffer", &l->type->name); + } + else + { + l->type->basetype = D3D10_SVT_CBUFFER; + copy_name("cbuffer", &l->type->name); + } + if (!l->type->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } - default: - ERR("Unexpected D3D10_CBUFFER_TYPE %#x!\n", d3d10_cbuffer_type); - return E_FAIL; + flags &= ~IS_TBUFFER; + if (flags) + { + ERR("Unexpected buffer flags %#x.\n", flags); + return E_FAIL; } l->type->member_count = read_u32(ptr);

3 months, 2 weeks

Vibhav Pant : configure: Correctly derive the target from CC if it's set to an absolute path.

by Alexandre Julliard

Module: wine Branch: master Commit: 36fa4da337b6a2c585ac20e4228c562dfb45af62 URL: https://gitlab.winehq.org/wine/wine/-/commit/36fa4da337b6a2c585ac20e4228c56… Author: Vibhav Pant <vibhavp(a)gmail.com> Date: Thu Feb 1 19:21:44 2024 +0530 configure: Correctly derive the target from CC if it's set to an absolute path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56279 --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index ca82387287a..e87495c42d9 100755 --- a/configure +++ b/configure @@ -10657,6 +10657,8 @@ then : while test $# -ge 1 do case "$1" in + */*-gcc) target=`expr "$1" : '.*/$.*$-gcc'` ;; + */*-clang) target=`expr "$1" : '.*/$.*$-clang'` ;; *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; *-clang) target=`expr "$1" : '$.*$-clang'` ;; esac diff --git a/configure.ac b/configure.ac index 4bf9f76848e..ba1be1bf9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -882,6 +882,8 @@ do while test $# -ge 1 do case "$1" in + */*-gcc) target=`expr "$1" : '.*/$.*$-gcc'` ;; + */*-clang) target=`expr "$1" : '.*/$.*$-clang'` ;; *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; *-clang) target=`expr "$1" : '$.*$-clang'` ;; esac

3 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024