August 2021 - Wine-commits - list.winehq.org

Zebediah Figura : ws2_32: Reimplement inet_addr() on top of inet_pton().
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 671cf16f773e5dafc7edbf7766aed9e52e4e7b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=671cf16f773e5dafc7edbf77… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 2 19:37:42 2021 -0500 ws2_32: Reimplement inet_addr() on top of inet_pton(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 9 ++++++--- dlls/ws2_32/tests/protocol.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 15616fdaf34..944f26912e6 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -2025,10 +2025,13 @@ int WINAPI WSAAddressToStringW( struct WS_sockaddr *addr, DWORD addr_len, /*********************************************************************** * inet_addr (ws2_32.11) */ -WS_u_long WINAPI WS_inet_addr( const char *cp ) +WS_u_long WINAPI WS_inet_addr( const char *str ) { - if (!cp) return INADDR_NONE; - return inet_addr( cp ); + WS_u_long addr; + + if (WS_inet_pton( WS_AF_INET, str, &addr ) == 1) + return addr; + return WS_INADDR_NONE; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 0a2e42721af..99c78873d9a 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -945,7 +945,7 @@ static void test_inet_pton(void) WSASetLastError(0xdeadbeef); ret = inet_addr(NULL); ok(ret == INADDR_NONE, "got %#x\n", ret); - todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) {

1 0

Alex Henrie : msdmo: Fix size of DMOGetName's array argument (GCC).
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 11f47ac74ba01cfd074c26232dae99cbb81a839c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f47ac74ba01cfd074c2623… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 22:13:37 2021 -0600 msdmo: Fix size of DMOGetName's array argument (GCC). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 33caa6d0dc5..d5c76c8273f 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -279,7 +279,7 @@ lend: * * Get DMO Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[80]) { static const INT max_name_len = 80*sizeof(WCHAR); DWORD count = max_name_len;

1 0

Alex Henrie : include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC).
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 14e205ff502ec7275d2c4cf59b1446ac0a294416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e205ff502ec7275d2c4cf5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 22:13:38 2021 -0600 include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msi.h b/include/msi.h index 604331a9e5f..c1ca99771a4 100644 --- a/include/msi.h +++ b/include/msi.h @@ -470,8 +470,8 @@ UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients) -UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR*, MSIINSTALLCONTEXT*, LPSTR, LPDWORD); -UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR*, MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT*, LPSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR[39], MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); #define MsiEnumClientsEx WINELIB_NAME_AW(MsiEnumClientsEx) UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*);

1 0

Martin Storsjö : mailmap: Add a mailmap entry for myself with the proper spelling.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: c44218ba501e7bafc3dadc5486f4340a183d5f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44218ba501e7bafc3dadc54… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Aug 2 12:03:09 2021 +0300 mailmap: Add a mailmap entry for myself with the proper spelling. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 81ca6946268..c545fa05d81 100644 --- a/.mailmap +++ b/.mailmap @@ -90,6 +90,7 @@ Luis Carlos Busquets Pérez <luiscar2001(a)yahoo.es> Mariusz Pluciński <vshader(a)gmail.com> Mark G. Adams <mark(a)transgaming.com> Markus Gömmel <m.goemmel(a)compulab.de> +Martin Storsjö <martin(a)martin.st> Matej Špindler <matej.spindler(a)gmail.com> Matej Špindler <spindler.matej(a)gmail.com> Matthew Finnicum <mattfinn(a)gmail.com>

1 0

Conor McCarthy : vkd3d-shader: Emit saturate modifier for double-precision float registers.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: vkd3d Branch: master Commit: 2f09f1d3591f75c033a9f5d870463fca90f459af URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2f09f1d3591f75c033a9f5d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 23:27:23 2021 +1000 vkd3d-shader: Emit saturate modifier for double-precision float registers. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c18f694..be7330e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2786,6 +2786,14 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_ component_count, (const uint32_t *)values); } +static uint32_t vkd3d_dxbc_compiler_get_constant_double_vector(struct vkd3d_dxbc_compiler *compiler, + double value, unsigned int component_count) +{ + const double values[] = {value, value}; + return vkd3d_dxbc_compiler_get_constant64(compiler, VKD3D_SHADER_COMPONENT_DOUBLE, + component_count, (const uint64_t *)values); +} + static uint32_t vkd3d_dxbc_compiler_get_type_id_for_reg(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask) { @@ -3763,11 +3771,19 @@ static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compile struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, one_id; - zero_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 0.0f, component_count); - one_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 1.0f, component_count); + if (reg->data_type == VKD3D_DATA_DOUBLE) + { + zero_id = vkd3d_dxbc_compiler_get_constant_double_vector(compiler, 0.0, component_count); + one_id = vkd3d_dxbc_compiler_get_constant_double_vector(compiler, 1.0, component_count); + } + else + { + zero_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 0.0f, component_count); + one_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 1.0f, component_count); + } type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); - if (reg->data_type == VKD3D_DATA_FLOAT) + if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE) return vkd3d_spirv_build_op_glsl_std450_nclamp(builder, type_id, val_id, zero_id, one_id); FIXME("Unhandled data type %#x.\n", reg->data_type);

1 0

Conor McCarthy : vkd3d-shader: Implement DADD instruction.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: vkd3d Branch: master Commit: eb804a5a9fca26d1f9919c3411172f622f60cd16 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eb804a5a9fca26d1f9919c3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 23:27:24 2021 +1000 vkd3d-shader: Implement DADD instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 6 +++--- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index da10205..2691125 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -310,6 +310,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, + VKD3D_SM5_OP_DADD = 0xbf, VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, @@ -1251,6 +1252,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_IMM_ATOMIC_UMIN, VKD3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, + {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index be7330e..a1f061c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6772,6 +6772,7 @@ static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_i {VKD3DSIH_AND, SpvOpBitwiseAnd}, {VKD3DSIH_BFREV, SpvOpBitReverse}, {VKD3DSIH_COUNTBITS, SpvOpBitCount}, + {VKD3DSIH_DADD, SpvOpFAdd}, {VKD3DSIH_DIV, SpvOpFDiv}, {VKD3DSIH_FTOI, SpvOpConvertFToS}, {VKD3DSIH_FTOU, SpvOpConvertFToU}, @@ -9511,6 +9512,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_AND: case VKD3DSIH_BFREV: case VKD3DSIH_COUNTBITS: + case VKD3DSIH_DADD: case VKD3DSIH_DIV: case VKD3DSIH_FTOI: case VKD3DSIH_FTOU: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d66681b..592befe 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -59,6 +59,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_CRS */ "crs", /* VKD3DSIH_CUT */ "cut", /* VKD3DSIH_CUT_STREAM */ "cut_stream", + /* VKD3DSIH_DADD */ "dadd", /* VKD3DSIH_DCL */ "dcl", /* VKD3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* VKD3DSIH_DCL_FUNCTION_BODY */ "dcl_function_body", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c450049..23f2b23 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -148,6 +148,7 @@ enum vkd3d_shader_opcode VKD3DSIH_CRS, VKD3DSIH_CUT, VKD3DSIH_CUT_STREAM, + VKD3DSIH_DADD, VKD3DSIH_DCL, VKD3DSIH_DCL_CONSTANT_BUFFER, VKD3DSIH_DCL_FUNCTION_BODY, diff --git a/tests/d3d12.c b/tests/d3d12.c index a43a7f2..f90526c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9881,12 +9881,12 @@ static void test_shader_instructions(void) {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, - {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true, true}, + {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true}, {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, - {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true, true}, - {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true, true}, + {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true}, + {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true}, {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true}, {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true},

1 0

Conor McCarthy : tests: Test for range overflow in test_root_signature_limits().
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: vkd3d Branch: master Commit: 50c4e43eaad608b065a8640a3f6cda3d0544659b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=50c4e43eaad608b065a8640… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 3 00:43:16 2021 +1000 tests: Test for range overflow in test_root_signature_limits(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f90526c..b930855 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2865,6 +2865,16 @@ static void test_root_signature_limits(void) hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* Windows results vary for overflowing to zero, but anything beyond that is invalid. */ + root_signature_desc.NumParameters = 1; + descriptor_ranges[0].NumDescriptors = 0x1001; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0xfffff000; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Conor McCarthy : vkd3d: Return E_INVALIDARG if a descriptor range overflows.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: vkd3d Branch: master Commit: 1c96f76afcae66666afb4fd8acc478f1a2f3f9e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c96f76afcae66666afb4fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 3 00:43:17 2021 +1000 vkd3d: Return E_INVALIDARG if a descriptor range overflows. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 3 +++ tests/d3d12.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index daa907b..102201d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -612,6 +612,9 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (range->OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) offset = range->OffsetInDescriptorsFromTableStart; + if (!vkd3d_bound_range(offset, range->NumDescriptors, UINT_MAX)) + return E_INVALIDARG; + table->ranges[j].offset = offset; table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); diff --git a/tests/d3d12.c b/tests/d3d12.c index b930855..9e61fd6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2870,10 +2870,7 @@ static void test_root_signature_limits(void) descriptor_ranges[0].NumDescriptors = 0x1001; descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0xfffff000; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0

Conor McCarthy : vkd3d: Use Vulkan descriptor arrays if descriptor indexing is available.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: vkd3d Branch: master Commit: 9ffe3626414c6c83791cfc1aef5f466f48cd2976 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9ffe3626414c6c83791cfc1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 3 00:43:18 2021 +1000 vkd3d: Use Vulkan descriptor arrays if descriptor indexing is available. Descriptor indexing is required for its partial binding feature. Separate buffer and image descriptor arrays are needed for implementing D3D12 SRV and UAV descriptor ranges, so not all of the Vulkan descriptors will be populated. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 11 ++-- libs/vkd3d/state.c | 127 +++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 2 - 4 files changed, 118 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9ffe3626414c6c83791…

1 0

Conor McCarthy : vkd3d-shader: Add a 64-bit immediate constant register type.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: vkd3d Branch: master Commit: a9eadaa06a1e561eac82ba68815d3ee3bb984794 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a9eadaa06a1e561eac82ba6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 23:27:20 2021 +1000 vkd3d-shader: Add a 64-bit immediate constant register type. Based in part on a vkd3d-proton patch by Joshua Ashton. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 15 +++++++----- libs/vkd3d-shader/trace.c | 41 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6e7c174..da10205 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -331,6 +331,7 @@ enum vkd3d_sm4_register_type VKD3D_SM4_RT_OUTPUT = 0x02, VKD3D_SM4_RT_INDEXABLE_TEMP = 0x03, VKD3D_SM4_RT_IMMCONST = 0x04, + VKD3D_SM4_RT_IMMCONST64 = 0x05, VKD3D_SM4_RT_SAMPLER = 0x06, VKD3D_SM4_RT_RESOURCE = 0x07, VKD3D_SM4_RT_CONSTBUFFER = 0x08, @@ -1265,7 +1266,7 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM4_RT_OUTPUT */ VKD3DSPR_OUTPUT, /* VKD3D_SM4_RT_INDEXABLE_TEMP */ VKD3DSPR_IDXTEMP, /* VKD3D_SM4_RT_IMMCONST */ VKD3DSPR_IMMCONST, - /* UNKNOWN */ ~0u, + /* VKD3D_SM4_RT_IMMCONST64 */ VKD3DSPR_IMMCONST64, /* VKD3D_SM4_RT_SAMPLER */ VKD3DSPR_SAMPLER, /* VKD3D_SM4_RT_RESOURCE */ VKD3DSPR_RESOURCE, /* VKD3D_SM4_RT_CONSTBUFFER */ VKD3DSPR_CONSTBUFFER, @@ -1656,21 +1657,23 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr return false; } - if (register_type == VKD3D_SM4_RT_IMMCONST) + if (register_type == VKD3D_SM4_RT_IMMCONST || register_type == VKD3D_SM4_RT_IMMCONST64) { enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; + unsigned int dword_count; switch (dimension) { case VKD3D_SM4_DIMENSION_SCALAR: param->immconst_type = VKD3D_IMMCONST_SCALAR; - if (end - *ptr < 1) + dword_count = 1 + (register_type == VKD3D_SM4_RT_IMMCONST64); + if (end - *ptr < dword_count) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); return false; } - memcpy(param->u.immconst_uint, *ptr, 1 * sizeof(DWORD)); - *ptr += 1; + memcpy(param->u.immconst_uint, *ptr, dword_count * sizeof(DWORD)); + *ptr += dword_count; break; case VKD3D_SM4_DIMENSION_VEC4: @@ -1744,7 +1747,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * return false; } - if (src_param->reg.type == VKD3DSPR_IMMCONST) + if (src_param->reg.type == VKD3DSPR_IMMCONST || src_param->reg.type == VKD3DSPR_IMMCONST64) { src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b80aef6..d66681b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -722,6 +722,17 @@ static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, prefix, compiler->colours.literal, f, compiler->colours.reset, suffix); } +static void shader_print_double_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, double d, const char *suffix) +{ + if (isfinite(d) && signbit(d)) + vkd3d_string_buffer_printf(&compiler->buffer, "%s-%s%.15e%s%s", + prefix, compiler->colours.literal, -d, compiler->colours.reset, suffix); + else + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%.15e%s%s", + prefix, compiler->colours.literal, d, compiler->colours.reset, suffix); +} + static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, int i, const char *suffix) { @@ -886,6 +897,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "l"); break; + case VKD3DSPR_IMMCONST64: + shader_addline(buffer, "d"); + break; + case VKD3DSPR_CONSTBUFFER: shader_addline(buffer, "cb"); is_descriptor = true; @@ -1058,6 +1073,29 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } shader_addline(buffer, ")"); } + else if (reg->type == VKD3DSPR_IMMCONST64) + { + shader_addline(buffer, "%s(", compiler->colours.reset); + /* A double2 vector is treated as a float4 vector in enum vkd3d_immconst_type. */ + if (reg->immconst_type == VKD3D_IMMCONST_SCALAR || reg->immconst_type == VKD3D_IMMCONST_VEC4) + { + if (reg->data_type == VKD3D_DATA_DOUBLE) + { + shader_print_double_literal(compiler, "", reg->u.immconst_double[0], ""); + if (reg->immconst_type == VKD3D_IMMCONST_VEC4) + shader_print_double_literal(compiler, ", ", reg->u.immconst_double[1], ""); + } + else + { + shader_addline(buffer, "<unhandled data type %#x>", reg->data_type); + } + } + else + { + shader_addline(buffer, "<unhandled immconst_type %#x>", reg->immconst_type); + } + shader_addline(buffer, ")"); + } else if (reg->type != VKD3DSPR_RASTOUT && reg->type != VKD3DSPR_MISCTYPE && reg->type != VKD3DSPR_NULL) @@ -1181,7 +1219,8 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, default: shader_addline(buffer, "_unknown_modifier(%#x)", src_modifier); } - if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_SAMPLER) + if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 + && param->reg.type != VKD3DSPR_SAMPLER) { static const char swizzle_chars[] = "xyzw"; DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9e40a3b..b3cd8ce 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -58,6 +58,7 @@ #include <string.h> #define VKD3D_VEC4_SIZE 4 +#define VKD3D_DVEC2_SIZE 2 enum vkd3d_shader_error { @@ -387,6 +388,7 @@ enum vkd3d_shader_register_type VKD3DSPR_LABEL = 18, VKD3DSPR_PREDICATE = 19, VKD3DSPR_IMMCONST, + VKD3DSPR_IMMCONST64, VKD3DSPR_CONSTBUFFER, VKD3DSPR_IMMCONSTBUFFER, VKD3DSPR_PRIMID, @@ -619,6 +621,7 @@ struct vkd3d_shader_register { DWORD immconst_uint[VKD3D_VEC4_SIZE]; float immconst_float[VKD3D_VEC4_SIZE]; + double immconst_double[VKD3D_DVEC2_SIZE]; unsigned fp_body_idx; } u; };

1 0