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

Paul Gofman : mfplat: Fix returned buffer length in dxgi_surface_buffer_lock().
by Alexandre Julliard 27 Apr '23

27 Apr '23

Module: wine Branch: master Commit: 5a162f2c316a28ad45f7c0707ed16b194204227e URL: https://gitlab.winehq.org/wine/wine/-/commit/5a162f2c316a28ad45f7c0707ed16b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 4 16:07:19 2023 -0600 mfplat: Fix returned buffer length in dxgi_surface_buffer_lock(). --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 52 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index d8de06fb23a..1b9ba24a408 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1063,7 +1063,7 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl if (buffer_start) *buffer_start = *scanline0; if (buffer_length) - *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; + *buffer_length = buffer->dxgi_surface.map_desc.DepthPitch; } return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 77b7b26ba9c..14a7beedacf 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7255,6 +7255,7 @@ static ID3D12Device *create_d3d12_device(void) static void test_d3d11_surface_buffer(void) { DWORD max_length, cur_length, length, color; + BYTE *data, *data2, *buffer_start; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; IMF2DBuffer2 *_2dbuffer2; @@ -7263,7 +7264,6 @@ static void test_d3d11_surface_buffer(void) IMFMediaBuffer *buffer; ID3D11Device *device; BYTE buff[64 * 64 * 4]; - BYTE *data, *data2; LONG pitch, pitch2; UINT index, size; IUnknown *obj; @@ -7575,7 +7575,54 @@ static void test_d3d11_surface_buffer(void) ID3D11Texture2D_Release(texture); - /* Subresource index 1. */ + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_NV12; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + if (SUCCEEDED(hr)) + { + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &buffer_start, &length); + ok(hr == S_OK, "got %#lx.\n", hr); + + ok(pitch >= desc.Width, "got %ld.\n", pitch); + ok(length == pitch * desc.Height * 3 / 2, "got %lu.\n", length); + + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "got %#lx.\n", hr); + + IMF2DBuffer2_Release(_2dbuffer2); + IMFMediaBuffer_Release(buffer); + ID3D11Texture2D_Release(texture); + } + else + { + win_skip("Failed to create NV12 texture, hr %#lx, skipping test.\n", hr); + ID3D11Device_Release(device); + return; + } + + /* Subresource index 1. + * When WARP d3d11 device is used, this test leaves the device in a broken state, so it should + * be kept last. */ + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Failed to create a texture, hr %#lx.\n", hr); @@ -7600,7 +7647,6 @@ static void test_d3d11_surface_buffer(void) IMF2DBuffer_Release(_2d_buffer); IMFMediaBuffer_Release(buffer); - ID3D11Texture2D_Release(texture); ID3D11Device_Release(device);

1 0

Francois Gouget : msi/tests: Fix the ok() formats so they match the size of their arguments.
by Alexandre Julliard 27 Apr '23

27 Apr '23

Module: wine Branch: master Commit: b6fb1b8983af7644b78bb0ba5fb9d18a1f0822f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6fb1b8983af7644b78bb0ba5fb9d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 13:16:08 2023 +0200 msi/tests: Fix the ok() formats so they match the size of their arguments. --- dlls/msi/tests/custom.c | 298 ++++++++++++++++++++++++------------------------ 1 file changed, 149 insertions(+), 149 deletions(-)

1 0

Francois Gouget : msi/tests: Ok_() takes printf-style arguments.
by Alexandre Julliard 27 Apr '23

27 Apr '23

Module: wine Branch: master Commit: a80b183af74194a06af3281ee272590a7134b7f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a80b183af74194a06af3281ee27259… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 13:13:59 2023 +0200 msi/tests: Ok_() takes printf-style arguments. This lets the compiler check that the format and argument sizes match. --- dlls/msi/tests/custom.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6c73687b3c5..5b81deb2c94 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -32,9 +32,15 @@ #include <msiquery.h> #include <msidefs.h> +#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__))) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static int todo_level, todo_do_loop; -static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV __WINE_PRINTF_ATTR(6,7) ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; MSIHANDLE record;

1 0

Jactry Zeng : appwiz.cpl: Process messages while waiting for the uninstaller to terminate.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 3e6779867a62e3e7a3562ed802191e3e309ff0b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e6779867a62e3e7a3562ed802191e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 3 09:09:06 2023 -0500 appwiz.cpl: Process messages while waiting for the uninstaller to terminate. In the current implementation, the main UI will be blocked after the uninstaller is launched. So using MsgWaitForMultipleObjects() to wait the process and process new messages from GUI. Also popup a message dialog while trying to launch multiple uninstallers. --- dlls/appwiz.cpl/appwiz.c | 45 ++++++++++++++++++++++++------------ dlls/appwiz.cpl/appwiz.rc | 1 + dlls/appwiz.cpl/res.h | 1 + po/ar.po | 58 +++++++++++++++++++++++++---------------------- po/ast.po | 58 +++++++++++++++++++++++++---------------------- po/bg.po | 58 +++++++++++++++++++++++++---------------------- po/ca.po | 58 +++++++++++++++++++++++++---------------------- po/cs.po | 58 +++++++++++++++++++++++++---------------------- po/da.po | 58 +++++++++++++++++++++++++---------------------- po/de.po | 58 +++++++++++++++++++++++++---------------------- po/el.po | 58 +++++++++++++++++++++++++---------------------- po/en.po | 58 +++++++++++++++++++++++++---------------------- po/en_US.po | 58 +++++++++++++++++++++++++---------------------- po/eo.po | 58 +++++++++++++++++++++++++---------------------- po/es.po | 58 +++++++++++++++++++++++++---------------------- po/fa.po | 58 +++++++++++++++++++++++++---------------------- po/fi.po | 58 +++++++++++++++++++++++++---------------------- po/fr.po | 58 +++++++++++++++++++++++++---------------------- po/he.po | 58 +++++++++++++++++++++++++---------------------- po/hi.po | 58 +++++++++++++++++++++++++---------------------- po/hr.po | 58 +++++++++++++++++++++++++---------------------- po/hu.po | 58 +++++++++++++++++++++++++---------------------- po/it.po | 58 +++++++++++++++++++++++++---------------------- po/ja.po | 58 +++++++++++++++++++++++++---------------------- po/ko.po | 58 +++++++++++++++++++++++++---------------------- po/lt.po | 58 +++++++++++++++++++++++++---------------------- po/ml.po | 58 +++++++++++++++++++++++++---------------------- po/nb_NO.po | 58 +++++++++++++++++++++++++---------------------- po/nl.po | 58 +++++++++++++++++++++++++---------------------- po/or.po | 58 +++++++++++++++++++++++++---------------------- po/pa.po | 58 +++++++++++++++++++++++++---------------------- po/pl.po | 58 +++++++++++++++++++++++++---------------------- po/pt_BR.po | 58 +++++++++++++++++++++++++---------------------- po/pt_PT.po | 58 +++++++++++++++++++++++++---------------------- po/rm.po | 58 +++++++++++++++++++++++++---------------------- po/ro.po | 58 +++++++++++++++++++++++++---------------------- po/ru.po | 58 +++++++++++++++++++++++++---------------------- po/si.po | 58 +++++++++++++++++++++++++---------------------- po/sk.po | 58 +++++++++++++++++++++++++---------------------- po/sl.po | 58 +++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 58 +++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 58 +++++++++++++++++++++++++---------------------- po/sv.po | 58 +++++++++++++++++++++++++---------------------- po/ta.po | 58 +++++++++++++++++++++++++---------------------- po/te.po | 58 +++++++++++++++++++++++++---------------------- po/th.po | 58 +++++++++++++++++++++++++---------------------- po/tr.po | 58 +++++++++++++++++++++++++---------------------- po/uk.po | 58 +++++++++++++++++++++++++---------------------- po/wa.po | 58 +++++++++++++++++++++++++---------------------- po/wine.pot | 58 +++++++++++++++++++++++++---------------------- po/zh_CN.po | 58 +++++++++++++++++++++++++---------------------- po/zh_TW.po | 58 +++++++++++++++++++++++++---------------------- 52 files changed, 1552 insertions(+), 1337 deletions(-)

1 0

Jactry Zeng : appwiz.cpl: Handle WM_CLOSE and WM_COMMAND(IDCANCEL) in the support info dialog.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 619e34500fc43f1103fddd91e86d581660d2ae4b URL: https://gitlab.winehq.org/wine/wine/-/commit/619e34500fc43f1103fddd91e86d58… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 4 02:42:31 2023 -0500 appwiz.cpl: Handle WM_CLOSE and WM_COMMAND(IDCANCEL) in the support info dialog. --- dlls/appwiz.cpl/appwiz.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 14917c14795..3359d5c4a2b 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -608,9 +608,14 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L case WM_DESTROY: return 0; + case WM_CLOSE: + EndDialog(hWnd, TRUE); + return TRUE; + case WM_COMMAND: switch (LOWORD(wParam)) { + case IDCANCEL: case IDOK: EndDialog(hWnd, TRUE); break;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add separate helpers to generate object methods.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: vkd3d Branch: master Commit: c166ab97278ea42a0726275bc494a5824b7a9092 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c166ab97278ea42a0726275bc494a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 19:13:46 2023 +0200 vkd3d-shader/hlsl: Add separate helpers to generate object methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 484 +++++++++++++++++++++++++---------------------- 1 file changed, 256 insertions(+), 228 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement SampleBias() method.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: vkd3d Branch: master Commit: af4bb037959a7aa7981444f4be0e8ff9854e8c0d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af4bb037959a7aa7981444f4be0e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 19:24:14 2023 +0200 vkd3d-shader/hlsl: Implement SampleBias() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++------ libs/vkd3d-shader/tpf.c | 34 ++++++++++++++++++++++++++++------ tests/sampler.shader_test | 13 +++++++++++++ 5 files changed, 60 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 32511590..f0b6a5ef 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2383,6 +2383,7 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", [HLSL_RESOURCE_SAMPLE_LOD] = "sample_lod", + [HLSL_RESOURCE_SAMPLE_LOD_BIAS] = "sample_biased", [HLSL_RESOURCE_GATHER_RED] = "gather_red", [HLSL_RESOURCE_GATHER_GREEN] = "gather_green", [HLSL_RESOURCE_GATHER_BLUE] = "gather_blue", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 974252d4..2ff18536 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -588,6 +588,7 @@ enum hlsl_resource_load_type HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, HLSL_RESOURCE_SAMPLE_LOD, + HLSL_RESOURCE_SAMPLE_LOD_BIAS, HLSL_RESOURCE_GATHER_RED, HLSL_RESOURCE_GATHER_GREEN, HLSL_RESOURCE_GATHER_BLUE, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a7237f1d..10deda75 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3819,21 +3819,26 @@ static bool add_gather_method_call(struct hlsl_ctx *ctx, struct list *instrs, st return true; } -static bool add_sample_level_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object, +static bool add_sample_lod_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object, const char *name, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { const struct hlsl_type *object_type = object->data_type; - struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE_LOD}; + struct hlsl_resource_load_params load_params = { 0 }; const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; + if (!strcmp(name, "SampleLevel")) + load_params.type = HLSL_RESOURCE_SAMPLE_LOD; + else + load_params.type = HLSL_RESOURCE_SAMPLE_LOD_BIAS; + if (params->args_count < 3 || params->args_count > 4 + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of arguments to method 'SampleLevel': expected from 3 to %u, but got %u.", - 4 + !!offset_dim, params->args_count); + "Wrong number of arguments to method '%s': expected from 3 to %u, but got %u.", + name, 4 + !!offset_dim, params->args_count); return false; } @@ -3845,7 +3850,7 @@ static bool add_sample_level_method_call(struct hlsl_ctx *ctx, struct list *inst if ((string = hlsl_type_to_string(ctx, sampler_type))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Wrong type for argument 0 of SampleLevel(): expected 'sampler', but got '%s'.", string->buffer); + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); hlsl_release_string_buffer(ctx, string); return false; } @@ -3920,7 +3925,13 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) { - return add_sample_level_method_call(ctx, instrs, object, name, params, loc); + return add_sample_lod_method_call(ctx, instrs, object, name, params, loc); + } + else if (!strcmp(name, "SampleBias") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) + { + return add_sample_lod_method_call(ctx, instrs, object, name, params, loc); } else { diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index f3a15305..d104c078 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3700,14 +3700,30 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf } static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, - const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, - const struct hlsl_deref *resource, const struct hlsl_deref *sampler, - const struct hlsl_ir_node *coords, const struct hlsl_ir_node *texel_offset) + const struct hlsl_ir_resource_load *load) { + const struct hlsl_type *resource_type = load->resource.var->data_type; + const struct hlsl_ir_node *texel_offset = load->texel_offset.node; + const struct hlsl_ir_node *coords = load->coords.node; + const struct hlsl_deref *resource = &load->resource; + const struct hlsl_deref *sampler = &load->sampler; + const struct hlsl_ir_node *dst = &load->node; struct sm4_instruction instr; memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_SAMPLE; + switch (load->load_type) + { + case HLSL_RESOURCE_SAMPLE: + instr.opcode = VKD3D_SM4_OP_SAMPLE; + break; + + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: + instr.opcode = VKD3D_SM4_OP_SAMPLE_B; + break; + + default: + vkd3d_unreachable(); + } if (texel_offset) { @@ -3727,6 +3743,12 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_deref(ctx, &instr.srcs[2], sampler, sampler->var->data_type, VKD3DSP_WRITEMASK_ALL); instr.src_count = 3; + if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS) + { + sm4_src_from_node(&instr.srcs[3], load->lod.node, VKD3DSP_WRITEMASK_ALL); + ++instr.src_count; + } + write_sm4_instruction(buffer, &instr); } @@ -4478,13 +4500,13 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: if (!load->sampler.var) { hlsl_fixme(ctx, &load->node.loc, "SM4 combined sample expression."); return; } - write_sm4_sample(ctx, buffer, resource_type, &load->node, - &load->resource, &load->sampler, coords, texel_offset); + write_sm4_sample(ctx, buffer, load); break; case HLSL_RESOURCE_GATHER_RED: diff --git a/tests/sampler.shader_test b/tests/sampler.shader_test index 3970fb51..2cb70a0b 100644 --- a/tests/sampler.shader_test +++ b/tests/sampler.shader_test @@ -32,3 +32,16 @@ float4 main() : sv_target [test] draw quad probe all rgba (0.25, 0, 0.25, 0) + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.SampleBias(s, float2(0.5, 0.5), 0.0); +} + +[test] +draw quad +probe all rgba (0.25, 0, 0.25, 0)

1 0

Zebediah Figura : dxgi: Introduce IWineDXGIDeviceParent::register_swapchain_texture() and use it in IDXGIDevice::CreateSurface().
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 4413e94908bfd561c759b121a7f460b51677cf0b URL: https://gitlab.winehq.org/wine/wine/-/commit/4413e94908bfd561c759b121a7f460… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 10 15:53:26 2023 -0500 dxgi: Introduce IWineDXGIDeviceParent::register_swapchain_texture() and use it in IDXGIDevice::CreateSurface(). Instead of having d3d11 create the wined3d texture, create it in dxgi instead, and let d3d11 create a d3d_texture2d object to wrap it. This is a step towards getting rid of the create_swapchain_texture() callback, which is mildly difficult to work with and conceptually complex. --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/device.c | 45 +++++++++++++++++++++++++-- dlls/d3d11/texture.c | 77 ++++++++++++++++++++++++++-------------------- dlls/dxgi/device.c | 28 +++++++++-------- include/wine/winedxgi.idl | 2 ++ 5 files changed, 107 insertions(+), 48 deletions(-)

1 0

Zebediah Figura : dxgi: Create d3d11 swapchain textures directly from d3d11_swapchain_init().
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 7b7d26a731c2c6bf03824638a8fa367d9b191b74 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b7d26a731c2c6bf03824638a8fa36… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 10 17:21:29 2023 -0500 dxgi: Create d3d11 swapchain textures directly from d3d11_swapchain_init(). Using the IWineDXGIDeviceParent::swapchain_texture_created() callback. --- dlls/d3d11/device.c | 41 ++--------------------------------------- dlls/dxgi/swapchain.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 01f5599c7d0..4cf066ef945 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6898,49 +6898,12 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic struct wined3d_texture **wined3d_texture) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); - struct d3d_texture2d *texture; - ID3D11Texture2D *texture_iface; - D3D11_TEXTURE2D_DESC desc; - HRESULT hr; TRACE("device_parent %p, container_parent %p, wined3d_desc %p, texture_flags %#lx, wined3d_texture %p.\n", device_parent, container_parent, wined3d_desc, texture_flags, wined3d_texture); - desc.Width = wined3d_desc->width; - desc.Height = wined3d_desc->height; - desc.MipLevels = 1; - desc.ArraySize = 1; - desc.Format = dxgi_format_from_wined3dformat(wined3d_desc->format); - desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; - desc.SampleDesc.Quality = wined3d_desc->multisample_quality; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = d3d11_bind_flags_from_wined3d(wined3d_desc->bind_flags); - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - - if (texture_flags & WINED3D_TEXTURE_CREATE_GET_DC) - { - desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; - texture_flags &= ~WINED3D_TEXTURE_CREATE_GET_DC; - } - - if (texture_flags) - FIXME("Unhandled flags %#lx.\n", texture_flags); - - if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device2_iface, - &desc, NULL, &texture_iface))) - { - WARN("Failed to create 2D texture, hr %#lx.\n", hr); - return hr; - } - - texture = impl_from_ID3D11Texture2D(texture_iface); - - *wined3d_texture = texture->wined3d_texture; - wined3d_texture_incref(*wined3d_texture); - ID3D11Texture2D_Release(&texture->ID3D11Texture2D_iface); - - return S_OK; + return wined3d_texture_create(device->wined3d_device, wined3d_desc, 1, 1, + texture_flags, NULL, NULL, &d3d_null_wined3d_parent_ops, wined3d_texture); } static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 910286b8c5f..0ba9db96108 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -848,6 +848,41 @@ static const struct wined3d_swapchain_state_parent_ops d3d11_swapchain_state_par d3d11_swapchain_windowed_state_changed, }; +static HRESULT d3d11_swapchain_create_d3d11_textures(struct d3d11_swapchain *swapchain, + struct dxgi_device *device, struct wined3d_swapchain_desc *desc) +{ + IWineDXGIDeviceParent *dxgi_device_parent; + unsigned int texture_flags = 0; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, + &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent))) + { + ERR("Device should implement IWineDXGIDeviceParent.\n"); + return E_FAIL; + } + + if (desc->flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) + texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; + + for (i = 0; i < desc->backbuffer_count; ++i) + { + IDXGISurface *surface; + + if (FAILED(hr = IWineDXGIDeviceParent_register_swapchain_texture(dxgi_device_parent, + wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, i), texture_flags, &surface))) + { + ERR("Failed to create parent swapchain texture, hr %#lx.\n", hr); + break; + } + IDXGISurface_Release(surface); + } + + IWineDXGIDeviceParent_Release(dxgi_device_parent); + return hr; +} + HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { @@ -891,6 +926,14 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#lx.\n", hr); + if (hr == WINED3DERR_INVALIDCALL) + hr = E_INVALIDARG; + goto cleanup; + } + + if (FAILED(hr = d3d11_swapchain_create_d3d11_textures(swapchain, device, desc))) + { + ERR("Failed to create d3d11 textures, hr %#lx.\n", hr); goto cleanup; }

1 0

Zebediah Figura : d3d9: Move surface allocation to d3d9_surface_create().
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 8a5b4252c8b9241b82caeb89d238b3257ed889e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a5b4252c8b9241b82caeb89d238b3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 10 17:52:53 2023 -0500 d3d9: Move surface allocation to d3d9_surface_create(). Renamed from d3d9_surface_init() accordingly. --- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 4 +--- dlls/d3d9/surface.c | 9 ++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7dc32e6c12f..dd9fd2a0039 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -179,11 +179,11 @@ struct d3d9_surface }; struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; +struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) DECLSPEC_HIDDEN; void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface, struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; -void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; struct d3d9_vertexbuffer diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c6083d351e3..75861032c3a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4502,12 +4502,10 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d { struct d3d9_surface *d3d_surface; - if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) + if (!(d3d_surface = d3d9_surface_create(wined3d_texture, sub_resource_idx, parent_ops))) return E_OUTOFMEMORY; - surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_surface; - TRACE("Created surface %p.\n", d3d_surface); } else if (type == WINED3D_RTYPE_TEXTURE_3D) { diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 810e4e00fb4..146cb8ce35c 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -347,10 +347,14 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, +struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { IDirect3DBaseTexture9 *texture; + struct d3d9_surface *surface; + + if (!(surface = heap_alloc_zero(sizeof(*surface)))) + return NULL; surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl; d3d9_resource_init(&surface->resource); @@ -368,6 +372,9 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_ } *parent_ops = &d3d9_surface_wined3d_parent_ops; + + TRACE("Created surface %p.\n", surface); + return surface; } static void STDMETHODCALLTYPE view_wined3d_object_destroyed(void *parent)

1 0