January 2024 - Wine-commits

Henri Verbeet : vkd3d-shader/dxbc: Pass an unsigned int count to shader_parse_root_parameters1().
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: 69350e1ff0bebced1af4f3cd99b33947aabaa30d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69350e1ff0bebced1af4f3cd99b33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 20:20:32 2023 +0100 vkd3d-shader/dxbc: Pass an unsigned int count to shader_parse_root_parameters1(). --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1d2677cb..e4353080 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -846,7 +846,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co } static int shader_parse_root_parameters1(struct root_signature_parser_context *context, - uint32_t offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) + uint32_t offset, unsigned int count, struct vkd3d_shader_root_parameter1 *parameters) { const char *ptr; unsigned int i;

1 0

Henri Verbeet : vkd3d-shader/dxbc: Use sizeof(uint32_t) instead of sizeof(DWORD) in calls to require_space().
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: 3e2ace8d33a203bf0c8d6a7bf140ef9a9a08352d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e2ace8d33a203bf0c8d6a7bf140e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 20:16:31 2023 +0100 vkd3d-shader/dxbc: Use sizeof(uint32_t) instead of sizeof(DWORD) in calls to require_space(). --- libs/vkd3d-shader/dxbc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e4353080..37ebc73c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -230,7 +230,7 @@ static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_ chunk_offset = read_u32(&ptr); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(uint32_t), data_size)) { WARN("Invalid chunk offset %#x (data size %zu).\n", chunk_offset, data_size); vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_OFFSET, @@ -593,7 +593,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * const char *ptr; unsigned int i; - if (!require_space(offset, 5 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 5 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -672,7 +672,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c unsigned int count; const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 2, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -699,7 +699,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context * unsigned int count; const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 2, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -724,7 +724,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con { const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -746,7 +746,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co { const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 2, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -778,7 +778,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c { const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -804,7 +804,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -852,7 +852,7 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 3 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; @@ -899,7 +899,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co const char *ptr; unsigned int i; - if (!require_space(offset, 13 * count, sizeof(DWORD), context->data_size)) + if (!require_space(offset, 13 * count, sizeof(uint32_t), context->data_size)) { WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT;

1 0

Nikolay Sivov : tests: Add some tests for effects groups syntax.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: ffae36974892485342dc6f1eed994b7af364cbf4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ffae36974892485342dc6f1eed994… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 15:26:38 2023 +0100 tests: Add some tests for effects groups syntax. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/technique-fx_2.shader_test | 30 ++++++++++++++++ tests/hlsl/technique-fx_4.shader_test | 24 +++++++++++++ tests/hlsl/technique-fx_5.shader_test | 66 +++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+) diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 90c734d5..2aac14ca 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -38,6 +38,13 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 fxgroup = {0, 0, 0, 0}; + return fxgroup; +} + [pixel shader] typedef float4 Technique10; typedef float4 Technique11; @@ -62,6 +69,13 @@ float4 main() : sv_target return teChnique11; } +[pixel shader] +float4 main() : sv_target +{ + float4 fxGroup = {0, 0, 0, 0}; + return fxGroup; +} + [effect todo] technique { @@ -103,6 +117,12 @@ tEchnique11 { } +[effect fail] +// Empty groups are not allowed +fxgroup group +{ +} + % Regular shaders with technique blocks [vertex shader todo] float4 main() : sv_position @@ -122,6 +142,11 @@ technique11 { } +fxgroup group +{ + technique10 {} +} + [pixel shader todo] float4 main() : sv_target { @@ -139,3 +164,8 @@ technique10 technique11 { } + +fxgroup group +{ + technique10 {} +} diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index fb8a3e67..2fc481de 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -9,6 +9,13 @@ float4 main() : sv_target return teChnique; } +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 fxgroup = {0, 0, 0, 0}; + return fxgroup; +} + [pixel shader] float4 main() : sv_target { @@ -23,6 +30,13 @@ float4 main() : sv_target return teChnique11; } +[pixel shader] +float4 main() : sv_target +{ + float4 fxGroup = {0, 0, 0, 0}; + return fxGroup; +} + [effect todo] technique { @@ -101,6 +115,11 @@ technique11 { } +fxgroup group +{ + technique10 {} +} + [pixel shader todo] float4 main() : sv_target { @@ -118,3 +137,8 @@ technique10 technique11 { } + +fxgroup group +{ + technique10 {} +} diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index aeea1a84..152227c6 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -9,6 +9,13 @@ float4 main() : sv_target return teChnique; } +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 fxgroup = {0, 0, 0, 0}; + return fxgroup; +} + [pixel shader] float4 main() : sv_target { @@ -23,6 +30,13 @@ float4 main() : sv_target return teChnique11; } +[pixel shader] +float4 main() : sv_target +{ + float4 fxGroup = {0, 0, 0, 0}; + return fxGroup; +} + [effect todo] technique { @@ -101,6 +115,11 @@ technique11 { } +fxgroup group +{ + technique10 {} +} + [pixel shader todo] float4 main() : sv_target { @@ -118,3 +137,50 @@ technique10 technique11 { } + +fxgroup group +{ + technique10 {} +} + +% Groups syntax + +% Name has to be specified, it belongs to global scope +[effect fail] +fxgroup +{ +} + +% Group can't be empty +[effect fail] +fxgroup group +{ +} + +[effect fail] +float4 group; + +fxgroup group +{ +} + +% Groups can only contain a list of techniques +[effect fail] +fxgroup group +{ + float4 v; + + technique11 {} +} + +% Group provides scope for techniques +[effect todo] +fxgroup group1 +{ + technique11 tech0 {} +} + +fxgroup group2 +{ + technique11 tech0 {} +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add 'fxgroup' token.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: c3af1f998981f7371bef6f16e126115ca74db574 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c3af1f998981f7371bef6f16e1261… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 15:37:01 2023 +0100 vkd3d-shader/hlsl: Add 'fxgroup' token. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 1 + tests/hlsl/technique-fx_2.shader_test | 2 +- tests/hlsl/technique-fx_4.shader_test | 2 +- tests/hlsl/technique-fx_5.shader_test | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index fe838750..6cef0e02 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -89,6 +89,7 @@ else {return KW_ELSE; } extern {return KW_EXTERN; } false {return KW_FALSE; } for {return KW_FOR; } +fxgroup {return KW_FXGROUP; } GeometryShader {return KW_GEOMETRYSHADER; } groupshared {return KW_GROUPSHARED; } if {return KW_IF; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 26f93574..9049d23e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4888,6 +4888,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_EXTERN %token KW_FALSE %token KW_FOR +%token KW_FXGROUP %token KW_GEOMETRYSHADER %token KW_GROUPSHARED %token KW_IF diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 2aac14ca..b13344e8 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -38,7 +38,7 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 fxgroup = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 2fc481de..7968cb9d 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target return teChnique; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 fxgroup = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 152227c6..29aa616f 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target return teChnique; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 fxgroup = {0, 0, 0, 0};

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Guess a sensible data type for literals.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: 017f86aaaf562c07eeb3ff45f9e469492daac701 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/017f86aaaf562c07eeb3ff45f9e46… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 9 23:31:27 2023 +0100 vkd3d-shader/d3d-asm: Guess a sensible data type for literals. When the typing information is not reliable. --- libs/vkd3d-shader/d3d_asm.c | 60 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 0589bc42..4829956c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -365,6 +365,7 @@ struct vkd3d_d3d_asm_compiler struct vkd3d_shader_version shader_version; struct vkd3d_d3d_asm_colours colours; enum vsir_asm_dialect dialect; + const struct vkd3d_shader_instruction *current; }; static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) @@ -841,6 +842,27 @@ static void shader_print_bool_literal(struct vkd3d_d3d_asm_compiler *compiler, compiler->colours.literal, b ? "true" : "false", compiler->colours.reset, suffix); } +static void shader_print_untyped_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, uint32_t u, const char *suffix) +{ + union + { + uint32_t u; + float f; + } value; + unsigned int exponent = (u >> 23) & 0xff; + + value.u = u; + + if (exponent != 0 && exponent != 0xff) + return shader_print_float_literal(compiler, prefix, value.f, suffix); + + if (u <= 10000) + return shader_print_uint_literal(compiler, prefix, value.u, suffix); + + return shader_print_hex_literal(compiler, prefix, value.u, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -1102,6 +1124,19 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const if (reg->type == VKD3DSPR_IMMCONST) { + bool untyped = false; + + switch (compiler->current->handler_idx) + { + case VKD3DSIH_MOV: + case VKD3DSIH_MOVC: + untyped = true; + break; + + default: + break; + } + shader_addline(buffer, "%s(", compiler->colours.reset); switch (reg->dimension) { @@ -1109,7 +1144,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); + if (untyped) + shader_print_untyped_literal(compiler, "", reg->u.immconst_u32[0], ""); + else + shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); break; case VKD3D_DATA_INT: shader_print_int_literal(compiler, "", reg->u.immconst_u32[0], ""); @@ -1129,10 +1167,20 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[1], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[2], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[3], ""); + if (untyped) + { + shader_print_untyped_literal(compiler, "", reg->u.immconst_u32[0], ""); + shader_print_untyped_literal(compiler, ", ", reg->u.immconst_u32[1], ""); + shader_print_untyped_literal(compiler, ", ", reg->u.immconst_u32[2], ""); + shader_print_untyped_literal(compiler, ", ", reg->u.immconst_u32[3], ""); + } + else + { + shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[1], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[2], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[3], ""); + } break; case VKD3D_DATA_INT: shader_print_int_literal(compiler, "", reg->u.immconst_u32[0], ""); @@ -1678,6 +1726,8 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int i; + compiler->current = ins; + if (ins->predicate) { vkd3d_string_buffer_printf(buffer, "(");

1 0

Akihiro Sagawa : d3d8/tests: Test the presentation parameters after creating a device.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: beefff000287388baf975f6210a8defa660892ad URL: https://gitlab.winehq.org/wine/wine/-/commit/beefff000287388baf975f6210a8de… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:09 2023 +0900 d3d8/tests: Test the presentation parameters after creating a device. --- dlls/d3d8/tests/device.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fd06e1bf79d..ef3a429afe0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8896,6 +8896,33 @@ static void test_swapchain_parameters(void) IDirect3DDevice8_Release(device); } + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 0; + present_parameters.BackBufferHeight = 0; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, + &present_parameters, &device); + + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!present_parameters.BackBufferWidth, "Got unexpected BackBufferWidth %u.\n", present_parameters.BackBufferWidth); + ok(!present_parameters.BackBufferHeight, "Got unexpected BackBufferHeight %u,.\n", present_parameters.BackBufferHeight); + ok(present_parameters.BackBufferFormat == D3DFMT_X8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", present_parameters.BackBufferFormat); + ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); + ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); + ok(present_parameters.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", present_parameters.SwapEffect); + ok(!present_parameters.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", present_parameters.hDeviceWindow); + ok(present_parameters.Windowed, "Got unexpected Windowed %#x.\n", present_parameters.Windowed); + ok(!present_parameters.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", present_parameters.EnableAutoDepthStencil); + ok(!present_parameters.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", present_parameters.AutoDepthStencilFormat); + ok(!present_parameters.Flags, "Got unexpected Flags %#lx.\n", present_parameters.Flags); + ok(!present_parameters.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", present_parameters.FullScreen_RefreshRateInHz); + ok(!present_parameters.FullScreen_PresentationInterval, "Got unexpected FullScreen_PresentationInterval %#x.\n", present_parameters.FullScreen_PresentationInterval); + + IDirect3DDevice8_Release(device); IDirect3D8_Release(d3d); DestroyWindow(window); }

1 0

Akihiro Sagawa : d3d9/tests: Test the presentation parameters after creating a device.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 45ea10c71f5540c9915553ce822a77d7cbcc033f URL: https://gitlab.winehq.org/wine/wine/-/commit/45ea10c71f5540c9915553ce822a77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:28 2023 +0900 d3d9/tests: Test the presentation parameters after creating a device. --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 77830cae631..44d5edba63c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3686,6 +3686,7 @@ static void test_swapchain_parameters(void) { IDirect3DDevice9Ex *device; IDirect3D9Ex *d3d9ex; + RECT client_rect; HWND window; HRESULT hr; unsigned int i; @@ -3837,6 +3838,39 @@ static void test_swapchain_parameters(void) IDirect3DDevice9Ex_Release(device); } + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 0; + present_parameters.BackBufferHeight = 0; + present_parameters.BackBufferFormat = D3DFMT_UNKNOWN; + + GetClientRect(window, &client_rect); + + hr = IDirect3D9Ex_CreateDeviceEx(d3d9ex, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, + &present_parameters, NULL, &device); + + todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + present_parameters.BackBufferWidth, client_rect.right); + todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + present_parameters.BackBufferHeight, client_rect.bottom); + todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + present_parameters.BackBufferFormat); + ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); + ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); + ok(!present_parameters.MultiSampleQuality, "Got unexpected MultiSampleQuality %lu.\n", present_parameters.MultiSampleQuality); + ok(present_parameters.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", present_parameters.SwapEffect); + ok(!present_parameters.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", present_parameters.hDeviceWindow); + ok(present_parameters.Windowed, "Got unexpected Windowed %#x.\n", present_parameters.Windowed); + ok(!present_parameters.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", present_parameters.EnableAutoDepthStencil); + ok(!present_parameters.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", present_parameters.AutoDepthStencilFormat); + ok(!present_parameters.Flags, "Got unexpected Flags %#lx.\n", present_parameters.Flags); + ok(!present_parameters.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", + present_parameters.FullScreen_RefreshRateInHz); + ok(!present_parameters.PresentationInterval, "Got unexpected PresentationInterval %#x.\n", present_parameters.PresentationInterval); + IDirect3DDevice9Ex_Release(device); + IDirect3D9Ex_Release(d3d9ex); DestroyWindow(window); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index de0bedba7ca..0af7f179df6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12296,6 +12296,7 @@ static void test_swapchain_parameters(void) { IDirect3DDevice9 *device; HRESULT hr, expected_hr; + RECT client_rect; IDirect3D9 *d3d; D3DCAPS9 caps; HWND window; @@ -12493,6 +12494,40 @@ static void test_swapchain_parameters(void) IDirect3DDevice9_Release(device); } + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 0; + present_parameters.BackBufferHeight = 0; + present_parameters.BackBufferFormat = D3DFMT_UNKNOWN; + + GetClientRect(window, &client_rect); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, + &present_parameters, &device); + + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + present_parameters.BackBufferWidth, client_rect.right); + todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + present_parameters.BackBufferHeight, client_rect.bottom); + todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + present_parameters.BackBufferFormat); + ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); + ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); + ok(!present_parameters.MultiSampleQuality, "Got unexpected MultiSampleQuality %lu.\n", present_parameters.MultiSampleQuality); + ok(present_parameters.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", present_parameters.SwapEffect); + ok(!present_parameters.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", present_parameters.hDeviceWindow); + ok(present_parameters.Windowed, "Got unexpected Windowed %#x.\n", present_parameters.Windowed); + ok(!present_parameters.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", present_parameters.EnableAutoDepthStencil); + ok(!present_parameters.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", present_parameters.AutoDepthStencilFormat); + ok(!present_parameters.Flags, "Got unexpected Flags %#lx.\n", present_parameters.Flags); + ok(!present_parameters.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", + present_parameters.FullScreen_RefreshRateInHz); + ok(!present_parameters.PresentationInterval, "Got unexpected PresentationInterval %#x.\n", present_parameters.PresentationInterval); + + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Akihiro Sagawa : d3d8/tests: Test the presentation parameters after creating an additional swap chain.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 8eefd729ecb41b75eebf500cbfe85862172a6ddd URL: https://gitlab.winehq.org/wine/wine/-/commit/8eefd729ecb41b75eebf500cbfe858… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:34 2023 +0900 d3d8/tests: Test the presentation parameters after creating an additional swap chain. --- dlls/d3d8/tests/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ef3a429afe0..108895e4d02 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -410,7 +410,11 @@ static void test_swapchain(void) d3dpp.BackBufferCount = 0; hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); - ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + ok(!d3dpp.BackBufferWidth, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferFormat == D3DFMT_A8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", d3dpp.BackBufferFormat); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow); d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1;

1 0

Akihiro Sagawa : d3d9/tests: Test the presentation parameters after creating an additional swap chain.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 059b3ac77f404c9fd3d7225b03d91d1b2e10e427 URL: https://gitlab.winehq.org/wine/wine/-/commit/059b3ac77f404c9fd3d7225b03d91d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:34 2023 +0900 d3d9/tests: Test the presentation parameters after creating an additional swap chain. --- dlls/d3d9/tests/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0af7f179df6..5c08d35c93f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1263,6 +1263,7 @@ static void test_swapchain(void) IDirect3DSurface9 *backbuffer, *stereo_buffer; D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice9 *device; + RECT client_rect; IDirect3D9 *d3d; ULONG refcount; HWND window, window2; @@ -1341,11 +1342,23 @@ static void test_swapchain(void) ok(swapchainX == NULL, "Swapchain 1 is %p\n", swapchainX); if(swapchainX) IDirect3DSwapChain9_Release(swapchainX); + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = D3DFMT_A8R8G8B8; + GetClientRect(window, &client_rect); + /* Create a bunch of swapchains */ d3dpp.BackBufferCount = 0; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); - ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + todo_wine ok(d3dpp.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + d3dpp.BackBufferWidth, client_rect.right); + todo_wine ok(d3dpp.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + d3dpp.BackBufferHeight, client_rect.bottom); + ok(d3dpp.BackBufferFormat == D3DFMT_A8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", d3dpp.BackBufferFormat); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow); d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1;

1 0

Akihiro Sagawa : d3d9: Update presentation parameters when creating a swap chain.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 98b053a5b8dcdfe2e3481a36cc156e71e2d5145e URL: https://gitlab.winehq.org/wine/wine/-/commit/98b053a5b8dcdfe2e3481a36cc156e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jan 8 18:02:55 2024 +0900 d3d9: Update presentation parameters when creating a swap chain. Fixes regression introduced by 215a32d643af4a8e25d4f28c5bec76f6e69dca22. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56070 --- dlls/d3d9/swapchain.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 6 +++--- dlls/d3d9/tests/device.c | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 26c47f2c6ec..e87b8627ba3 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -370,6 +370,7 @@ static const struct wined3d_swapchain_state_parent_ops d3d9_swapchain_state_pare static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_device *device, struct wined3d_swapchain_desc *desc, unsigned int swap_interval) { + struct wined3d_swapchain_desc swapchain_desc; HRESULT hr; swapchain->refcount = 1; @@ -384,6 +385,11 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi return hr; } + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + desc->backbuffer_width = swapchain_desc.backbuffer_width; + desc->backbuffer_height = swapchain_desc.backbuffer_height; + desc->backbuffer_format = swapchain_desc.backbuffer_format; + swapchain->parent_device = &device->IDirect3DDevice9Ex_iface; IDirect3DDevice9Ex_AddRef(swapchain->parent_device); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 44d5edba63c..8e7eec13566 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3851,11 +3851,11 @@ static void test_swapchain_parameters(void) window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, NULL, &device); - todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", present_parameters.BackBufferWidth, client_rect.right); - todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", present_parameters.BackBufferHeight, client_rect.bottom); - todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", present_parameters.BackBufferFormat); ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5c08d35c93f..9d92b248dd9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1352,9 +1352,9 @@ static void test_swapchain(void) d3dpp.BackBufferCount = 0; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + ok(d3dpp.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", d3dpp.BackBufferWidth, client_rect.right); - todo_wine ok(d3dpp.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + ok(d3dpp.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", d3dpp.BackBufferHeight, client_rect.bottom); ok(d3dpp.BackBufferFormat == D3DFMT_A8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", d3dpp.BackBufferFormat); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); @@ -12521,11 +12521,11 @@ static void test_swapchain_parameters(void) &present_parameters, &device); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", present_parameters.BackBufferWidth, client_rect.right); - todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", present_parameters.BackBufferHeight, client_rect.bottom); - todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", present_parameters.BackBufferFormat); ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType);

1 0