May 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Store the framebuffer state inline in struct wined3d_cs_clear.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: a17c0a7213cae5a48c1d2b469e55aa0d4b8b61eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17c0a7213cae5a48c1d2b46… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:28 2021 -0500 wined3d: Store the framebuffer state inline in struct wined3d_cs_clear. Avoid storing pointers to the CS data inside individual ops, so that we can reallocate the queue when appending data to a deferred context, or copy the queue contents to a command list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 14076defaa9..8702ac08631 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -107,7 +107,7 @@ struct wined3d_cs_clear enum wined3d_cs_op opcode; DWORD flags; unsigned int rt_count; - struct wined3d_fb_state *fb; + struct wined3d_fb_state fb; RECT draw_rect; struct wined3d_color color; float depth; @@ -684,19 +684,19 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_clear *op = data; unsigned int i; - device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, + device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, &op->fb, op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) { for (i = 0; i < op->rt_count; ++i) { - if (op->fb->render_targets[i]) - wined3d_resource_release(op->fb->render_targets[i]->resource); + if (op->fb.render_targets[i]) + wined3d_resource_release(op->fb.render_targets[i]->resource); } } if (op->flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - wined3d_resource_release(op->fb->depth_stencil->resource); + wined3d_resource_release(op->fb.depth_stencil->resource); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, @@ -715,7 +715,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; - op->fb = &cs->state.fb; + op->fb = state->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); @@ -746,24 +746,23 @@ void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_c struct wined3d_cs_clear *op; size_t size; - size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); + size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]); op = wined3d_device_context_require_space(context, size, WINED3D_CS_QUEUE_DEFAULT); - op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1; - op->fb->render_targets[0] = view; - op->fb->depth_stencil = NULL; + op->fb.render_targets[0] = view; + op->fb.depth_stencil = NULL; op->color = *color; } else { op->rt_count = 0; - op->fb->render_targets[0] = NULL; - op->fb->depth_stencil = view; + op->fb.render_targets[0] = NULL; + op->fb.depth_stencil = view; op->depth = depth; op->stencil = stencil; }

1 0

Zebediah Figura : d3d11: Implement ID3D11DeviceContext::ExecuteCommandList().
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: d0052d9127e912a4afb4b06248b56704281c561d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0052d9127e912a4afb4b062… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:35 2021 -0500 d3d11: Implement ID3D11DeviceContext::ExecuteCommandList(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 ++++++- dlls/d3d11/tests/d3d11.c | 30 +++++------- dlls/wined3d/cs.c | 109 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 8 +++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 2 + 7 files changed, 150 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0052d9127e912a4afb4…

1 0

Anton Baskanov : quartz/dsoundrender: Defer EC_COMPLETE until running.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 4a9936e31896b8e529ca1c5ce2e6d31f29942e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a9936e31896b8e529ca1c5c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:45 2021 +0700 quartz/dsoundrender: Defer EC_COMPLETE until running. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 14 +++++++++++++- dlls/quartz/tests/dsoundrender.c | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 7c92eb6e6cc..68c88ea5a15 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -461,7 +461,8 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) filter->eos = TRUE; - if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + if (filter->filter.state == State_Running && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, @@ -599,6 +600,8 @@ static HRESULT dsound_render_init_stream(struct strmbase_filter *iface) static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) { struct dsound_render *filter = impl_from_strmbase_filter(iface); + IFilterGraph *graph = filter->filter.graph; + IMediaEventSink *event_sink; filter->stream_start = start; @@ -607,6 +610,15 @@ static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFEREN if (filter->sink.pin.peer) IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING); + if (filter->eos && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + return S_OK; } diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 87c3706b145..fdc23d2b48c 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -920,7 +920,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = send_frame(input); todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); @@ -928,7 +928,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + ok(ret == 1, "Expected EC_COMPLETE.\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alexandre Julliard : winebuild: Store all parameters on the stack for syscall thunks on ARM.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 543e49397fd54b87bebae0c95f99dca33f7d7a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=543e49397fd54b87bebae0c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 21:13:18 2021 +0200 winebuild: Store all parameters on the stack for syscall thunks on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 4 +- tools/winebuild/import.c | 89 ++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 5e53f323aeb..11b6aa8d0ad 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -174,6 +174,7 @@ struct syscall_frame { DWORD pad; DWORD cpsr; + DWORD r4; DWORD r5; DWORD r6; DWORD r7; @@ -181,9 +182,8 @@ struct syscall_frame DWORD r9; DWORD r10; DWORD r11; - DWORD thunk_addr; - DWORD r4; DWORD ret_addr; + DWORD thunk_addr; }; struct arm_thread_data diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b745f16db42..141936dca30 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1697,41 +1697,44 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tjmp 2b\n" ); break; case CPU_ARM: - output( "\tpush {r5-r11,lr}\n" ); + output( "\tpush {r4-r11}\n" ); output( "\tadd r6, sp, #40\n" ); /* stack parameters */ output( "\tldr r5, 6f+8\n" ); - output( "\tcmp r4, r5\n" ); + output( "\tcmp ip, r5\n" ); output( "\tbcs 5f\n" ); output( "\tsub sp, sp, #8\n" ); output( "\tmrc p15, 0, r7, c13, c0, 2\n" ); /* NtCurrentTeb() */ output( "\tadd r7, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ - output( "\tmrs ip, CPSR\n" ); - output( "\tbfi ip, lr, #5, #1\n" ); /* set thumb bit */ - output( "\tstr ip, [sp, #4]\n" ); + output( "\tmrs r0, CPSR\n" ); + output( "\tbfi r0, lr, #5, #1\n" ); /* set thumb bit */ + output( "\tstr r0, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */ output( "\tldr r5, 6f+4\n"); if (UsePIC) output( "1:\tadd r5, pc\n"); - output( "\tldrb r5, [r5, r4]\n" ); /* syscall args */ - output( "\tsubs r5, #16\n" ); /* first 4 args are in registers */ - output( "\tble 3f\n" ); - output( "\tsub ip, sp, r5\n" ); - output( "\tand ip, #~7\n" ); - output( "\tmov sp, ip\n" ); + output( "\tldrb r5, [r5, ip]\n" ); /* syscall args */ + output( "\tcmp r5, #16\n" ); + output( "\tit le\n" ); + output( "\tmovle r5, #16\n" ); + output( "\tsub r0, sp, r5\n" ); + output( "\tand r0, #~7\n" ); + output( "\tmov sp, r0\n" ); output( "2:\tsubs r5, r5, #4\n" ); - output( "\tldr ip, [r6, r5]\n" ); - output( "\tstr ip, [sp, r5]\n" ); + output( "\tldr r0, [r6, r5]\n" ); + output( "\tstr r0, [sp, r5]\n" ); output( "\tbgt 2b\n" ); - output( "3:\tldr r5, 6f\n"); + output( "\tldr r5, 6f\n"); if (UsePIC) output( "4:\tadd r5, pc\n"); - output( "\tldr ip, [r5, r4, lsl #2]\n"); /* syscall table */ + output( "\tldr ip, [r5, ip, lsl #2]\n"); /* syscall table */ + output( "\tpop {r0-r3}\n" ); /* first 4 args are in registers */ output( "\tblx ip\n"); output( "\tmov ip, #0\n" ); output( "\tstr ip, [r7]\n" ); output( "\tsub ip, r6, #40\n" ); output( "\tmov sp, ip\n" ); - output( "\tpop {r5-r11,pc}\n" ); - output( "5:\tldr r0, 6f+12\n" ); - output( "\tpop {r5-r11,pc}\n" ); + output( "\tpop {r4-r12,pc}\n" ); + output( "5:\tmovw r0, #0x%x\n", invalid_param & 0xffff ); + output( "\tmovt r0, #0x%x\n", invalid_param >> 16 ); + output( "\tpop {r4-r12,pc}\n" ); if (UsePIC) { output( "6:\t.long .Lsyscall_table-4b-%u\n", thumb_mode ? 4 : 8 ); @@ -1743,7 +1746,6 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\t.long .Lsyscall_args\n" ); } output( "\t.long %u\n", count ); - output( "\t.long 0x%x\n", invalid_param ); break; case CPU_ARM64: output( "\tcmp x8, %u\n", count ); @@ -1922,22 +1924,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tret\n" ); break; case CPU_ARM: - output( "\tpush {r4,lr}\n" ); - output( "\tmov r4, #%u\n", i ); - if (UsePIC) - { - output( "\tldr ip, 2f\n"); - output( "1:\tadd ip, pc\n" ); - } - else - { - output( "\tmovw ip, :lower16:%s\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tmovt ip, :upper16:%s\n", asm_name("__wine_syscall_dispatcher") ); - } - output( "\tldr ip, [ip]\n"); - output( "\tblx ip\n"); - output( "\tpop {r4,pc}\n" ); - if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); + output( "\tpush {r0-r3}\n" ); + output( "\tmovw ip, #%u\n", i ); + output( "\tmov r3, lr\n" ); + output( "\tbl %s\n", asm_name("__wine_syscall") ); + output( "\tadd sp, #16\n" ); + output( "\tbx ip\n" ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); @@ -1958,13 +1950,38 @@ void output_syscalls( DLLSPEC *spec ) output_function_size( name ); } - if (target_cpu == CPU_x86 && !UsePIC) + switch (target_cpu) { + case CPU_x86: + if (UsePIC) break; output( "\t.align %d\n", get_alignment(16) ); output( "\t%s\n", func_declaration("__wine_syscall") ); output( "%s:\n", asm_name("__wine_syscall") ); output( "\tjmp *(%s)\n", asm_name("__wine_syscall_dispatcher") ); output_function_size( "__wine_syscall" ); + break; + case CPU_ARM: + output( "\t.align %d\n", get_alignment(16) ); + output( "\t%s\n", func_declaration("__wine_syscall") ); + output( "%s:\n", asm_name("__wine_syscall") ); + output( "\tpush {r3,lr}\n" ); + if (UsePIC) + { + output( "\tldr r0, 2f\n"); + output( "1:\tadd r0, pc\n" ); + } + else + { + output( "\tmovw r0, :lower16:%s\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tmovt r0, :upper16:%s\n", asm_name("__wine_syscall_dispatcher") ); + } + output( "\tldr r0, [r0]\n"); + output( "\tbx r0\n"); + if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); + output_function_size( "__wine_syscall" ); + break; + default: + break; } output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) );

1 0

Zebediah Figura : d3d11: Implement ID3D11DeviceContext::ClearState() using a single CS op.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 97d3ea26b9e42ebf29a038a5b68234a7b6bb0f6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=97d3ea26b9e42ebf29a038a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:32 2021 -0500 d3d11: Implement ID3D11DeviceContext::ClearState() using a single CS op. Specifically, tweak and make use of the already existing WINED3D_CS_OP_RESET_STATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 40 +--------------------------------------- dlls/wined3d/cs.c | 16 +++++++++++++--- dlls/wined3d/device.c | 13 +++++++++++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 1 + 6 files changed, 28 insertions(+), 45 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 3fbd5ec903a..50a0672c1e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2597,49 +2597,11 @@ static void STDMETHODCALLTYPE d3d11_device_context_CSGetConstantBuffers(ID3D11De static void STDMETHODCALLTYPE d3d11_device_context_ClearState(ID3D11DeviceContext1 *iface) { struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; - unsigned int i, j; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - wined3d_device_context_set_shader(context->wined3d_context, i, NULL); - for (j = 0; j < D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++j) - wined3d_device_context_set_constant_buffer(context->wined3d_context, i, j, NULL); - for (j = 0; j < D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++j) - wined3d_device_context_set_shader_resource_view(context->wined3d_context, i, j, NULL); - for (j = 0; j < D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT; ++j) - wined3d_device_context_set_sampler(context->wined3d_context, i, j, NULL); - } - for (i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) - { - wined3d_device_context_set_stream_source(context->wined3d_context, i, NULL, 0, 0); - } - wined3d_device_context_set_index_buffer(context->wined3d_context, NULL, WINED3DFMT_UNKNOWN, 0); - wined3d_device_context_set_vertex_declaration(context->wined3d_context, NULL); - wined3d_device_context_set_primitive_type(context->wined3d_context, WINED3D_PT_UNDEFINED, 0); - for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - wined3d_device_context_set_rendertarget_view(context->wined3d_context, i, NULL, FALSE); - } - wined3d_device_context_set_depth_stencil_view(context->wined3d_context, NULL); - for (i = 0; i < WINED3D_PIPELINE_COUNT; ++i) - { - for (j = 0; j < D3D11_PS_CS_UAV_REGISTER_COUNT; ++j) - wined3d_device_context_set_unordered_access_view(context->wined3d_context, i, j, NULL, ~0u); - } - ID3D11DeviceContext1_OMSetDepthStencilState(iface, NULL, 0); - ID3D11DeviceContext1_OMSetBlendState(iface, NULL, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); - ID3D11DeviceContext1_RSSetViewports(iface, 0, NULL); - ID3D11DeviceContext1_RSSetScissorRects(iface, 0, NULL); - ID3D11DeviceContext1_RSSetState(iface, NULL); - for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) - { - wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); - } - wined3d_device_context_set_predication(context->wined3d_context, NULL, FALSE); + wined3d_device_context_reset_state(context->wined3d_context); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 77d40801414..b55bfdab866 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -359,6 +359,7 @@ struct wined3d_cs_push_constants struct wined3d_cs_reset_state { enum wined3d_cs_op opcode; + bool invalidate; }; struct wined3d_cs_callback @@ -2143,18 +2144,27 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { + const struct wined3d_cs_reset_state *op = data; + unsigned int state; + state_cleanup(&cs->state); wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); + if (op->invalidate) + { + for (state = 0; state <= STATE_HIGHEST; ++state) + device_invalidate_state(cs->c.device, state); + } } -void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) +void wined3d_device_context_emit_reset_state(struct wined3d_device_context *context, bool invalidate) { struct wined3d_cs_reset_state *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_RESET_STATE; + op->invalidate = invalidate; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_callback(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dcb9a91ebe6..8df04d682f9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1169,7 +1169,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - wined3d_cs_emit_reset_state(device->cs); + wined3d_device_context_emit_reset_state(&device->cs->c, false); state_cleanup(state); wine_rb_clear(&device->samplers, device_free_sampler, NULL); @@ -1649,6 +1649,15 @@ void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_ *rect_count = state->scissor_rect_count; } +void CDECL wined3d_device_context_reset_state(struct wined3d_device_context *context) +{ + TRACE("context %p.\n", context); + + state_cleanup(context->state); + wined3d_state_reset(context->state, &context->device->adapter->d3d_info); + wined3d_device_context_emit_reset_state(context, true); +} + void CDECL wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state) { const struct wined3d_light_info *light; @@ -5417,7 +5426,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (reset_state) { TRACE("Resetting state.\n"); - wined3d_cs_emit_reset_state(device->cs); + wined3d_device_context_emit_reset_state(&device->cs->c, false); state_cleanup(state); LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index be88f8a60db..b83502b7ff2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -114,6 +114,7 @@ @ cdecl wined3d_device_context_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) +@ cdecl wined3d_device_context_reset_state(ptr) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fadad706af4..af9beffc142 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4737,7 +4737,6 @@ void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *c void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, @@ -4775,6 +4774,7 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, bool indexed) DECLSPEC_HIDDEN; void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_reset_state(struct wined3d_device_context *context, bool invalidate) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f75047be873..64021ff5205 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2480,6 +2480,7 @@ void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *c HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags); +void __cdecl wined3d_device_context_reset_state(struct wined3d_device_context *context); void __cdecl wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id);

1 0

Zebediah Figura : wined3d: Keep a list of acquired resources in struct wined3d_deferred_context.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: eae83897f528b68741f6786b48d78d19adba2e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae83897f528b68741f6786b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:31 2021 -0500 wined3d: Keep a list of acquired resources in struct wined3d_deferred_context. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3f05d593b7c..77d40801414 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3169,6 +3169,9 @@ struct wined3d_deferred_context SIZE_T data_size, data_capacity; void *data; + + SIZE_T resource_count, resources_capacity; + struct wined3d_resource **resources; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3256,7 +3259,14 @@ static void wined3d_deferred_context_flush(struct wined3d_device_context *contex static void wined3d_deferred_context_acquire_resource(struct wined3d_device_context *context, struct wined3d_resource *resource) { - FIXME("context %p, resource %p, stub!\n", context, resource); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + + if (!wined3d_array_reserve((void **)&deferred->resources, &deferred->resources_capacity, + deferred->resource_count + 1, sizeof(*deferred->resources))) + return; + + deferred->resources[deferred->resource_count++] = resource; + wined3d_resource_incref(resource); } static const struct wined3d_device_context_ops wined3d_deferred_context_ops = @@ -3301,9 +3311,14 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *context) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + SIZE_T i; TRACE("context %p.\n", context); + for (i = 0; i < deferred->resource_count; ++i) + wined3d_resource_decref(deferred->resources[i]); + heap_free(deferred->resources); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred);

1 0

Anton Baskanov : quartz/dsoundrender: Don't reset EOS on paused->running state transition.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: a2504b8ec70da37dbe98b6a547502297d31db1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2504b8ec70da37dbe98b6a5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:44 2021 +0700 quartz/dsoundrender: Don't reset EOS on paused->running state transition. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 656a5e1f7ab..7c92eb6e6cc 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -605,10 +605,7 @@ static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFEREN SetEvent(filter->state_event); if (filter->sink.pin.peer) - { - filter->eos = FALSE; IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING); - } return S_OK; }

1 0

Zebediah Figura : d3d11: Implement ID3D11Device1::CreateDeferredContext1().
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 9aab4fa8d71b1b8444403a1898b31f12f89ee65e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aab4fa8d71b1b8444403a18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:30 2021 -0500 d3d11: Implement ID3D11Device1::CreateDeferredContext1(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41636 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++++-- dlls/d3d11/tests/d3d11.c | 5 +---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1a02b95772c..3fbd5ec903a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4078,9 +4078,17 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device2 *iface, UINT flags, ID3D11DeviceContext1 **context) { - FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d11_device_context *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, flags %#x, context %p.\n", iface, flags, context); + + if (FAILED(hr = d3d11_deferred_context_create(device, flags, &object))) + return hr; + + *context = &object->ID3D11DeviceContext1_iface; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 77ea747d981..d8c3b2df19c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32397,9 +32397,7 @@ static void test_deferred_context_swap_state(void) ID3D11DeviceContext1_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); hr = ID3D11Device1_CreateDeferredContext1(device, 0, &deferred); - todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); - if (hr != S_OK) - goto out; + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); feature_level = ID3D11Device1_GetFeatureLevel(device); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, @@ -32420,7 +32418,6 @@ static void test_deferred_context_swap_state(void) ID3DDeviceContextState_Release(state); ID3D11DeviceContext1_Release(deferred); -out: ID3D11Buffer_Release(green_buffer); ID3D11DeviceContext1_Release(immediate); ID3D11Device1_Release(device);

1 0

Zebediah Figura : d3d11: Implement ID3D11DeviceContext::FinishCommandList().
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 01658a4a8e854c6b9e7d325043eb4664e6e5a22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=01658a4a8e854c6b9e7d3250… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:33 2021 -0500 d3d11: Implement ID3D11DeviceContext::FinishCommandList(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 10 +++ dlls/d3d11/device.c | 155 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/cs.c | 103 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 4 ++ include/wine/wined3d.h | 6 ++ 5 files changed, 277 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01658a4a8e854c6b9e7d…

1 0

Piotr Caban : user32: Depend on SetWindowPos to refresh window manager hints in SetWindowRgn.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: a1ca90d68abf5649de0abeb3dfdf1a1666f5f5c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ca90d68abf5649de0abeb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 27 17:06:24 2021 +0200 user32: Depend on SetWindowPos to refresh window manager hints in SetWindowRgn. Otherwise both on Linux and Mac, the window will not restore title bar when it becomes non-shaped until it's e.g. moved. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 9ac8bedfd09..6e96a4b5964 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -217,8 +217,8 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) { UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE; if (!bRedraw) swp_flags |= SWP_NOREDRAW; - SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); USER_Driver->pSetWindowRgn( hwnd, hrgn, bRedraw ); + SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); if (hrgn) DeleteObject( hrgn ); } return ret;

1 0