wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Ivo Ivanov : dinput: Return DI_DOWNLOADSKIPPED from SetParameters.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: ee8015b97ab003ed55ed25e9a56a2eadf415814e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8015b97ab003ed55ed25e9… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 15 11:14:06 2021 +0100 dinput: Return DI_DOWNLOADSKIPPED from SetParameters. When Download or Start failed because device is not acquired. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 7 ++++--- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a5fbfb81332..67a43924e19 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2406,9 +2406,10 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa impl->flags |= flags; if (flags & DIEP_NODOWNLOAD) return DI_DOWNLOADSKIPPED; - if (flags & DIEP_START) return IDirectInputEffect_Start( iface, 1, 0 ); - if (FAILED(hr = IDirectInputEffect_Download( iface ))) return hr; - if (hr == DI_NOEFFECT) return DI_DOWNLOADSKIPPED; + if (flags & DIEP_START) hr = IDirectInputEffect_Start( iface, 1, 0 ); + else hr = IDirectInputEffect_Download( iface ); + if (hr == DIERR_NOTEXCLUSIVEACQUIRED) return DI_DOWNLOADSKIPPED; + if (FAILED(hr)) return hr; return DI_OK; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 8aeebc62ab7..9bbe5dbcbcc 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5697,7 +5697,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); hr = IDirectInputEffect_SetParameters( effect, &expect_desc, DIEP_DURATION ); - todo_wine ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Acquire( device );

1 0

Rémi Bernon : dinput8/tests: Test effect creation with unacquired device.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 979b19ce73256a09a42cfa46dce0b12d705b32fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=979b19ce73256a09a42cfa46… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 15 11:14:05 2021 +0100 dinput8/tests: Test effect creation with unacquired device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a4721b246eb..8aeebc62ab7 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5696,7 +5696,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); - hr = IDirectInputEffect_SetParameters( effect, &expect_desc, DIEP_DURATION | DIEP_NODOWNLOAD ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, DIEP_DURATION ); + todo_wine ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Acquire( device ); @@ -6147,6 +6148,20 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ok( ref == 0, "Release returned %d\n", ref ); winetest_pop_context(); } + + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, &expect_desc, &effect, NULL ); + todo_wine + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); } static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DWORD version )

1 0

Rémi Bernon : dinput8/tests: Improve HID joystick tests output.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: dab7d15c744e39a19673ebe9bc56ddb9b2a1fdb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dab7d15c744e39a19673ebe9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 15 11:14:04 2021 +0100 dinput8/tests: Improve HID joystick tests output. Reducing verbosity and fixing typos and potentially interleaved lines. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 16 +++++++++------- dlls/dinput8/tests/driver_hid.h | 11 +++++++++-- dlls/dinput8/tests/hid.c | 21 +++++++++------------ 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 45c9f3e14ab..d6f085e4f30 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -479,7 +479,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); winetest_push_context( "%s expect[%d]", expect.context, index ); - ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, @@ -503,7 +503,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); winetest_push_context( "%s expect[%d]", expect.context, index ); - ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); winetest_pop_context(); @@ -526,7 +526,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); winetest_push_context( "%s expect[%d]", expect.context, index ); - ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, @@ -550,7 +550,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); winetest_push_context( "%s expect[%d]", expect.context, index ); - ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); winetest_pop_context(); @@ -573,7 +573,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) expect_queue_next( &expect_queue, code, packet, &index, &expect, TRUE ); winetest_push_context( "%s expect[%d]", expect.context, index ); - ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, @@ -586,12 +586,14 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) } case IOCTL_HID_GET_STRING: - todo_wine - ok( 0, "unexpected IOCTL_HID_GET_STRING\n" ); + { + static unsigned int once; + if (!once++) todo_wine ok( 0, "unexpected IOCTL_HID_GET_STRING\n" ); memcpy( irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test") ); irp->IoStatus.Information = sizeof(L"Wine Test"); ret = STATUS_SUCCESS; break; + } default: ok( 0, "unexpected ioctl %#x\n", code ); diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 4fec0e99e47..6c355760171 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -147,8 +147,15 @@ static inline void kvprintf( const char *format, va_list ap ) { struct tls_data *data = get_tls_data(); IO_STATUS_BLOCK io; - int len = vsnprintf( data->strings, sizeof(data->strings), format, ap ); - ZwWriteFile( okfile, NULL, NULL, NULL, &io, data->strings, len, NULL, NULL ); + int len = vsnprintf( data->str_pos, sizeof(data->strings) - (data->str_pos - data->strings), format, ap ); + data->str_pos += len; + + if (len && data->str_pos[-1] == '\n') + { + ZwWriteFile( okfile, NULL, NULL, NULL, &io, data->strings, + strlen( data->strings ), NULL, NULL ); + data->str_pos = data->strings; + } } static inline void WINAPIV kprintf( const char *format, ... ) __WINE_PRINTF_ATTR( 1, 2 ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 66e8c7c0b0d..a4721b246eb 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -594,22 +594,19 @@ static BOOL pnp_driver_start( const WCHAR *resource ) return ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; } -#define check_member_( file, line, val, exp, fmt, member ) \ - ok_( file, line )((val).member == (exp).member, "got " #member " " fmt ", expected " fmt "\n", \ - (val).member, (exp).member) -#define check_member( val, exp, fmt, member ) \ +#define check_member_( file, line, val, exp, fmt, member ) \ + ok_(file, line)( (val).member == (exp).member, "got " #member " " fmt "\n", (val).member ) +#define check_member( val, exp, fmt, member ) \ check_member_( __FILE__, __LINE__, val, exp, fmt, member ) -#define check_member_guid_( file, line, val, exp, member ) \ - ok_( file, line )(IsEqualGUID( &(val).member, &(exp).member ), "got " #member " %s, expected %s\n", \ - debugstr_guid( &(val).member ), debugstr_guid( &(exp).member )) -#define check_member_guid( val, exp, member ) \ +#define check_member_guid_( file, line, val, exp, member ) \ + ok_(file, line)( IsEqualGUID( &(val).member, &(exp).member ), "got " #member " %s\n", debugstr_guid(&(val).member) ) +#define check_member_guid( val, exp, member ) \ check_member_guid_( __FILE__, __LINE__, val, exp, member ) -#define check_member_wstr_( file, line, val, exp, member ) \ - ok_( file, line )(!wcscmp( (val).member, (exp).member ), "got " #member " %s, expected %s\n", \ - debugstr_w((val).member), debugstr_w((exp).member)) -#define check_member_wstr( val, exp, member ) \ +#define check_member_wstr_( file, line, val, exp, member ) \ + ok_(file, line)( !wcscmp( (val).member, (exp).member ), "got " #member " %s\n", debugstr_w((val).member) ) +#define check_member_wstr( val, exp, member ) \ check_member_wstr_( __FILE__, __LINE__, val, exp, member ) #define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b )

1 0

Jan Sikorski : wined3d: Acquire references to samplers in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 0056ebf91ef3dd6a903e87adbdc1460bc08b4181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0056ebf91ef3dd6a903e87ad… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:35 2021 +0100 wined3d: Acquire references to samplers in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 57 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2aa9f570d3e..caeb4edbc1a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -76,6 +76,9 @@ struct wined3d_command_list SIZE_T shader_count; struct wined3d_shader **shaders; + + SIZE_T sampler_count; + struct wined3d_sampler **samplers; }; static void wined3d_command_list_destroy_object(void *object) @@ -127,6 +130,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); for (i = 0; i < list->shader_count; ++i) wined3d_shader_decref(list->shaders[i]); + for (i = 0; i < list->sampler_count; ++i) + wined3d_sampler_decref(list->samplers[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -633,6 +638,12 @@ static inline void wined3d_device_context_acquire_shader(struct wined3d_device_c context->ops->acquire_shader(context, shader); } +static inline void wined3d_device_context_acquire_samplers(struct wined3d_device_context *context, + struct wined3d_sampler * const *samplers, unsigned int count) +{ + context->ops->acquire_samplers(context, samplers, count); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1820,6 +1831,7 @@ void wined3d_device_context_emit_set_samplers(struct wined3d_device_context *con op->count = count; memcpy(op->samplers, samplers, count * sizeof(*samplers)); + wined3d_device_context_acquire_samplers(context, samplers, count); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -3029,6 +3041,11 @@ static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, { } +static void wined3d_cs_acquire_samplers(struct wined3d_device_context *context, + struct wined3d_sampler * const *samplers, unsigned int count) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3272,6 +3289,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, wined3d_cs_acquire_shader, + wined3d_cs_acquire_samplers, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3403,6 +3421,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, wined3d_cs_acquire_shader, + wined3d_cs_acquire_samplers, }; static void poll_queries(struct wined3d_cs *cs) @@ -3641,6 +3660,9 @@ struct wined3d_deferred_context SIZE_T shader_count, shaders_capacity; struct wined3d_shader **shaders; + + SIZE_T sampler_count, samplers_capacity; + struct wined3d_sampler **samplers; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3887,6 +3909,26 @@ static void wined3d_deferred_context_acquire_shader(struct wined3d_device_contex wined3d_shader_incref(shader); } +static void wined3d_deferred_context_acquire_samplers(struct wined3d_device_context *context, + struct wined3d_sampler * const *samplers, unsigned int count) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + unsigned int i; + + if (!wined3d_array_reserve((void **)&deferred->samplers, &deferred->samplers_capacity, + deferred->sampler_count + count, sizeof(*deferred->samplers))) + return; + + for (i = 0; i < count; ++i) + { + if (samplers[i]) + { + deferred->samplers[deferred->sampler_count++] = samplers[i]; + wined3d_sampler_incref(samplers[i]); + } + } +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3903,6 +3945,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, wined3d_deferred_context_acquire_shader, + wined3d_deferred_context_acquire_samplers, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3976,6 +4019,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_shader_decref(deferred->shaders[i]); heap_free(deferred->shaders); + for (i = 0; i < deferred->sampler_count; ++i) + wined3d_sampler_decref(deferred->samplers[i]); + heap_free(deferred->samplers); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3999,6 +4046,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->shader_count * sizeof(*object->shaders) + + deferred->sampler_count * sizeof(*object->samplers) + deferred->data_size); if (!memory) @@ -4064,6 +4112,12 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); /* Transfer our references to the shaders to the command list. */ + object->samplers = memory; + memory = &object->samplers[deferred->sampler_count]; + object->sampler_count = deferred->sampler_count; + memcpy(object->samplers, deferred->samplers, deferred->sampler_count * sizeof(*object->samplers)); + /* Transfer our references to the samplers to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4077,6 +4131,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; deferred->shader_count = 0; + deferred->sampler_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 94f0f94b1d7..7838d45425a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4853,6 +4853,8 @@ struct wined3d_device_context_ops void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); + void (*acquire_samplers)(struct wined3d_device_context *context, struct wined3d_sampler * const *samplers, + unsigned int count); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to shaders in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 908fb50728a33da6f7238cafcc8163065785ab0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=908fb50728a33da6f7238caf… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:34 2021 +0100 wined3d: Acquire references to shaders in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 911b9a2b9c8..2aa9f570d3e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -73,6 +73,9 @@ struct wined3d_command_list SIZE_T depth_stencil_state_count; struct wined3d_depth_stencil_state **depth_stencil_states; + + SIZE_T shader_count; + struct wined3d_shader **shaders; }; static void wined3d_command_list_destroy_object(void *object) @@ -122,6 +125,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); for (i = 0; i < list->depth_stencil_state_count; ++i) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); + for (i = 0; i < list->shader_count; ++i) + wined3d_shader_decref(list->shaders[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -622,6 +627,12 @@ static inline void wined3d_device_context_acquire_depth_stencil_state(struct win context->ops->acquire_depth_stencil_state(context, depth_stencil_state); } +static inline void wined3d_device_context_acquire_shader(struct wined3d_device_context *context, + struct wined3d_shader *shader) +{ + context->ops->acquire_shader(context, shader); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1834,6 +1845,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte op->type = type; op->shader = shader; + if (shader) + wined3d_device_context_acquire_shader(context, shader); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -3011,6 +3024,11 @@ static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context { } +static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, + struct wined3d_shader *shader) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3253,6 +3271,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, + wined3d_cs_acquire_shader, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3383,6 +3402,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, + wined3d_cs_acquire_shader, }; static void poll_queries(struct wined3d_cs *cs) @@ -3618,6 +3638,9 @@ struct wined3d_deferred_context SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; struct wined3d_depth_stencil_state **depth_stencil_states; + + SIZE_T shader_count, shaders_capacity; + struct wined3d_shader **shaders; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3852,6 +3875,18 @@ static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_ wined3d_depth_stencil_state_incref(depth_stencil_state); } +static void wined3d_deferred_context_acquire_shader(struct wined3d_device_context *context, + struct wined3d_shader *shader) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->shaders, &deferred->shaders_capacity, + deferred->shader_count + 1, sizeof(*deferred->shaders))) + return; + + deferred->shaders[deferred->shader_count++] = shader; + wined3d_shader_incref(shader); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3867,6 +3902,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, + wined3d_deferred_context_acquire_shader, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3936,6 +3972,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); heap_free(deferred->depth_stencil_states); + for (i = 0; i < deferred->shader_count; ++i) + wined3d_shader_decref(deferred->shaders[i]); + heap_free(deferred->shaders); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3958,6 +3998,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + + deferred->shader_count * sizeof(*object->shaders) + deferred->data_size); if (!memory) @@ -4017,6 +4058,12 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); /* Transfer our references to the depth stencil states to the command list. */ + object->shaders = memory; + memory = &object->shaders[deferred->shader_count]; + object->shader_count = deferred->shader_count; + memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); + /* Transfer our references to the shaders to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4029,6 +4076,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; + deferred->shader_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74c7932220b..94f0f94b1d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4852,6 +4852,7 @@ struct wined3d_device_context_ops struct wined3d_rasterizer_state *rasterizer_state); void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); + void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to depth stencil states in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 6057507be428776514595cef49ef57546e5d1f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6057507be428776514595cef… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:33 2021 +0100 wined3d: Acquire references to depth stencil states in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 51 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1c41194eff6..911b9a2b9c8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -70,6 +70,9 @@ struct wined3d_command_list SIZE_T rasterizer_state_count; struct wined3d_rasterizer_state **rasterizer_states; + + SIZE_T depth_stencil_state_count; + struct wined3d_depth_stencil_state **depth_stencil_states; }; static void wined3d_command_list_destroy_object(void *object) @@ -117,6 +120,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_blend_state_decref(list->blend_states[i]); for (i = 0; i < list->rasterizer_state_count; ++i) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); + for (i = 0; i < list->depth_stencil_state_count; ++i) + wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -611,6 +616,12 @@ static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3 context->ops->acquire_rasterizer_state(context, rasterizer_state); } +static inline void wined3d_device_context_acquire_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state) +{ + context->ops->acquire_depth_stencil_state(context, depth_stencil_state); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1882,6 +1893,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c op->state = state; op->stencil_ref = stencil_ref; + if (state) + wined3d_device_context_acquire_depth_stencil_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2993,6 +3006,11 @@ static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *c { } +static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3234,6 +3252,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, + wined3d_cs_acquire_depth_stencil_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3363,6 +3382,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, + wined3d_cs_acquire_depth_stencil_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3595,6 +3615,9 @@ struct wined3d_deferred_context SIZE_T rasterizer_state_count, rasterizer_states_capacity; struct wined3d_rasterizer_state **rasterizer_states; + + SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; + struct wined3d_depth_stencil_state **depth_stencil_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3817,6 +3840,18 @@ static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_dev wined3d_rasterizer_state_incref(rasterizer_state); } +static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->depth_stencil_states, &deferred->depth_stencil_states_capacity, + deferred->depth_stencil_state_count + 1, sizeof(*deferred->depth_stencil_states))) + return; + + deferred->depth_stencil_states[deferred->depth_stencil_state_count++] = depth_stencil_state; + wined3d_depth_stencil_state_incref(depth_stencil_state); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3831,6 +3866,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, + wined3d_deferred_context_acquire_depth_stencil_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3896,6 +3932,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); heap_free(deferred->rasterizer_states); + for (i = 0; i < deferred->depth_stencil_state_count; ++i) + wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); + heap_free(deferred->depth_stencil_states); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3917,6 +3957,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->data_size); if (!memory) @@ -3969,6 +4010,13 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); /* Transfer our references to the rasterizer states to the command list. */ + object->depth_stencil_states = memory; + memory = &object->depth_stencil_states[deferred->depth_stencil_state_count]; + object->depth_stencil_state_count = deferred->depth_stencil_state_count; + memcpy(object->depth_stencil_states, deferred->depth_stencil_states, + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); + /* Transfer our references to the depth stencil states to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -3980,6 +4028,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; + deferred->depth_stencil_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ecdfe1006a3..74c7932220b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4850,6 +4850,8 @@ struct wined3d_device_context_ops void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); void (*acquire_rasterizer_state)(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); + void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to rasterizer states in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: a313f6bc5ce8616efdf50848fc8527f16dfc9eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=a313f6bc5ce8616efdf50848… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:32 2021 +0100 wined3d: Acquire references to rasterizer states in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 51 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 063e8bd0a04..1c41194eff6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -67,6 +67,9 @@ struct wined3d_command_list SIZE_T blend_state_count; struct wined3d_blend_state **blend_states; + + SIZE_T rasterizer_state_count; + struct wined3d_rasterizer_state **rasterizer_states; }; static void wined3d_command_list_destroy_object(void *object) @@ -112,6 +115,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_query_decref(list->queries[i].query); for (i = 0; i < list->blend_state_count; ++i) wined3d_blend_state_decref(list->blend_states[i]); + for (i = 0; i < list->rasterizer_state_count; ++i) + wined3d_rasterizer_state_decref(list->rasterizer_states[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -600,6 +605,12 @@ static inline void wined3d_device_context_acquire_blend_state(struct wined3d_dev context->ops->acquire_blend_state(context, blend_state); } +static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) +{ + context->ops->acquire_rasterizer_state(context, rasterizer_state); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1891,6 +1902,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; + if (rasterizer_state) + wined3d_device_context_acquire_rasterizer_state(context, rasterizer_state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2975,6 +2988,11 @@ static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *contex { } +static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3215,6 +3233,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, + wined3d_cs_acquire_rasterizer_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3343,6 +3362,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, + wined3d_cs_acquire_rasterizer_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3572,6 +3592,9 @@ struct wined3d_deferred_context SIZE_T blend_state_count, blend_states_capacity; struct wined3d_blend_state **blend_states; + + SIZE_T rasterizer_state_count, rasterizer_states_capacity; + struct wined3d_rasterizer_state **rasterizer_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3782,6 +3805,18 @@ static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_c wined3d_blend_state_incref(blend_state); } +static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->rasterizer_states, &deferred->rasterizer_states_capacity, + deferred->rasterizer_state_count + 1, sizeof(*deferred->rasterizer_states))) + return; + + deferred->rasterizer_states[deferred->rasterizer_state_count++] = rasterizer_state; + wined3d_rasterizer_state_incref(rasterizer_state); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3795,6 +3830,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, + wined3d_deferred_context_acquire_rasterizer_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3856,6 +3892,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_blend_state_decref(deferred->blend_states[i]); heap_free(deferred->blend_states); + for (i = 0; i < deferred->rasterizer_state_count; ++i) + wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); + heap_free(deferred->rasterizer_states); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3876,6 +3916,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) + + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->data_size); if (!memory) @@ -3921,6 +3962,13 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); /* Transfer our references to the blend states to the command list. */ + object->rasterizer_states = memory; + memory = &object->rasterizer_states[deferred->rasterizer_state_count]; + object->rasterizer_state_count = deferred->rasterizer_state_count; + memcpy(object->rasterizer_states, deferred->rasterizer_states, + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); + /* Transfer our references to the rasterizer states to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -3931,6 +3979,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; deferred->blend_state_count = 0; + deferred->rasterizer_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a4df301dcb..ecdfe1006a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4848,6 +4848,8 @@ struct wined3d_device_context_ops void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); + void (*acquire_rasterizer_state)(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to blend states in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 2228c356e3bae97b9bf1b99169d6b12b76e62a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2228c356e3bae97b9bf1b991… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:31 2021 +0100 wined3d: Acquire references to blend states in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f161b63be3c..063e8bd0a04 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -64,6 +64,9 @@ struct wined3d_command_list SIZE_T query_count; struct wined3d_deferred_query_issue *queries; + + SIZE_T blend_state_count; + struct wined3d_blend_state **blend_states; }; static void wined3d_command_list_destroy_object(void *object) @@ -107,6 +110,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_resource_decref(list->uploads[i].resource); for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); + for (i = 0; i < list->blend_state_count; ++i) + wined3d_blend_state_decref(list->blend_states[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -589,6 +594,12 @@ static inline void wined3d_device_context_acquire_resource(struct wined3d_device context->ops->acquire_resource(context, resource); } +static inline void wined3d_device_context_acquire_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state) +{ + context->ops->acquire_blend_state(context, blend_state); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1831,6 +1842,8 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * op->factor = *blend_factor; op->sample_mask = sample_mask; + if (state) + wined3d_device_context_acquire_blend_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2957,6 +2970,11 @@ static void wined3d_cs_acquire_resource(struct wined3d_device_context *context, wined3d_resource_acquire(resource); } +static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3196,6 +3214,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, + wined3d_cs_acquire_blend_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3323,6 +3342,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, + wined3d_cs_acquire_blend_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3549,6 +3569,9 @@ struct wined3d_deferred_context SIZE_T query_count, queries_capacity; struct wined3d_deferred_query_issue *queries; + + SIZE_T blend_state_count, blend_states_capacity; + struct wined3d_blend_state **blend_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3747,6 +3770,18 @@ static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_ wined3d_command_list_incref(deferred->command_lists[deferred->command_list_count++] = list); } +static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->blend_states, &deferred->blend_states_capacity, + deferred->blend_state_count + 1, sizeof(*deferred->blend_states))) + return; + + deferred->blend_states[deferred->blend_state_count++] = blend_state; + wined3d_blend_state_incref(blend_state); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3759,6 +3794,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, + wined3d_deferred_context_acquire_blend_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3816,6 +3852,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_query_decref(deferred->queries[i].query); heap_free(deferred->queries); + for (i = 0; i < deferred->blend_state_count; ++i) + wined3d_blend_state_decref(deferred->blend_states[i]); + heap_free(deferred->blend_states); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3835,6 +3875,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->upload_count * sizeof(*object->uploads) + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) + + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->data_size); if (!memory) @@ -3874,6 +3915,12 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); /* Transfer our references to the queries to the command list. */ + object->blend_states = memory; + memory = &object->blend_states[deferred->blend_state_count]; + object->blend_state_count = deferred->blend_state_count; + memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); + /* Transfer our references to the blend states to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -3883,6 +3930,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->upload_count = 0; deferred->command_list_count = 0; deferred->query_count = 0; + deferred->blend_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c5f7dda228..3a4df301dcb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4847,6 +4847,7 @@ struct wined3d_device_context_ops void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); + void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); }; struct wined3d_device_context

1 0

Esme Povirk : mfplat: Allow deleting open files.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 3a7830615a94c324832dd36a70917d9867b8e355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7830615a94c324832dd36a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Nov 13 15:36:43 2021 -0600 mfplat: Allow deleting open files. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- dlls/mfplat/tests/mfplat.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 37a66798b2f..c36a2069bd8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4407,7 +4407,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open { DWORD capabilities = MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK; DWORD filecreation_disposition = 0, fileaccessmode = 0, fileattributes = 0; - DWORD filesharemode = FILE_SHARE_READ; + DWORD filesharemode = FILE_SHARE_READ | FILE_SHARE_DELETE; struct bytestream *object; FILETIME writetime; HANDLE file; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 541459c715b..0f928284534 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2077,10 +2077,14 @@ static void test_file_stream(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, pathW, &bytestream); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(DeleteFileW(filename), "failed to delete file\n"); + IMFByteStream_Release(bytestream); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); - DeleteFileW(filename); DeleteFileW(newfilename); }

1 0

Alistair Leslie-Hughes : msdasql: Implement IRowsetInfo GetSpecification.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 26c4a1edc78d6822c709aa755e5b938454336e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c4a1edc78d6822c709aa75… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 14 17:12:34 2021 +1100 msdasql: Implement IRowsetInfo GetSpecification. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 18 ++++++++++++++++-- dlls/msdasql/tests/provider.c | 16 ++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 6e9c4b680e9..82693115b8a 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -426,6 +426,7 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; + IUnknown *caller; LONG refs; }; @@ -524,6 +525,10 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) if (!refs) { TRACE( "destroying %p\n", rowset ); + + if (rowset->caller) + IUnknown_Release(rowset->caller); + heap_free( rowset ); } return refs; @@ -618,8 +623,16 @@ static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID ri IUnknown **specification) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); - return E_NOTIMPL; + + TRACE("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); + + if (!specification) + return E_INVALIDARG; + + if (!rowset->caller) + return S_FALSE; + + return IUnknown_QueryInterface(rowset->caller, riid, (void**)specification); } struct IRowsetInfoVtbl rowset_info_vtbl = @@ -798,6 +811,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; msrowset->refs = 1; + ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); if (affected) *affected = 0; /* FIXME */ diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 353e2ec58c8..b0e13b72589 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -293,17 +293,29 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } -static void test_rowset_interfaces(IRowset *rowset) +static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) { IRowsetInfo *info; IColumnsInfo *col_info; IColumnsRowset *col_rs; IAccessor *accessor; + ICommandText *specification = NULL; IUnknown *unk; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IRowsetInfo_GetSpecification(info, &IID_ICommandText, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IRowsetInfo_GetSpecification(info, &IID_ICommandText, (IUnknown**)&specification); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (specification) + { + ok(commandtext == specification, "got 0x%08x\n", hr); + ICommandText_Release(specification); + } IRowsetInfo_Release(info); hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); @@ -364,7 +376,7 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); - test_rowset_interfaces(rowset); + test_rowset_interfaces(rowset, comand_text); IRowset_Release(rowset); IUnknown_Release(unk);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021