December 2019 - Wine-commits

Hans Leidekker : msado15: Implement Fields_get_Item.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: a9452acbfafb7e72e3a5099de78c2fa7383e1684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9452acbfafb7e72e3a5099d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 12 17:12:22 2019 +0100 msado15: Implement Fields_get_Item. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/msado15/tests/msado15.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a20d5920da..ff06b8789a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -433,10 +433,48 @@ static HRESULT WINAPI fields_Refresh( Fields *iface ) return E_NOTIMPL; } +static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) +{ + ULONG i; + + if (V_VT( index ) != VT_BSTR) + { + FIXME( "variant type %u not supported\n", V_VT( index ) ); + return E_INVALIDARG; + } + + for (i = 0; i < fields->count; i++) + { + BSTR name; + BOOL match; + HRESULT hr; + + if ((hr = Field_get_Name( fields->field[i], &name )) != S_OK) return hr; + match = !wcsicmp( V_BSTR( index ), name ); + SysFreeString( name ); + if (match) + { + *ret = i; + return S_OK; + } + } + + return E_INVALIDARG; +} + static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) { - FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), obj ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + HRESULT hr; + ULONG i; + + TRACE( "%p, %s, %p\n", fields, debugstr_variant(&index), obj ); + + if ((hr = map_index( fields, &index, &i )) != S_OK) return hr; + + Field_AddRef( fields->field[i] ); + *obj = fields->field[i]; + return S_OK; } static BOOL resize_fields( struct fields *fields, ULONG count ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 03b2828d9f..800eb236fe 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,12 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static LONG get_refs_field( Field *field ) +{ + Field_AddRef( field ); + return Field_Release( field ); +} + static LONG get_refs_fields( Fields *fields ) { Fields_AddRef( fields ); @@ -92,9 +98,10 @@ static void test_Fields(void) { _Recordset *recordset; Fields *fields; - VARIANT val; + Field *field, *field2; + VARIANT val, index; BSTR name; - LONG count; + LONG refs, count; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -127,6 +134,37 @@ static void test_Fields(void) hr = Fields_get_Count( fields, &count ); ok( count == 2, "got %d\n", count ); + /* handing out field object doesn't add reference to fields or recordset object */ + name = SysAllocString( L"field" ); + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = name; + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_field( field ); + ok( refs == 1, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* calling get_Item again returns the same object and adds reference */ + hr = Fields_get_Item( fields, index, &field2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( field2 == field, "expected same object\n" ); + refs = get_refs_field( field2 ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + Field_Release( field2 ); + SysFreeString( name ); + + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); }

1 0

Hans Leidekker : msado15: Implement Field_get_Attributes and Field_get_DefinedSize.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 56e2ac139c828a8f724c9a0939bcd49a72b418bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e2ac139c828a8f724c9a09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 12 17:12:23 2019 +0100 msado15: Implement Field_get_Attributes and Field_get_DefinedSize. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 22 +++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ff06b8789a..b262243d89 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -147,14 +147,22 @@ static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) { - TRACE( "%p, %p\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, attrs ); + + *attrs = field->attrs; + return S_OK; } static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, size ); + + *size = field->defined_size; + return S_OK; } static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 800eb236fe..f9a5377c50 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -101,7 +101,9 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count; + LONG refs, count, size; + DataTypeEnum type; + FieldAttributeEnum attrs; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -164,6 +166,24 @@ static void test_Fields(void) Field_Release( field2 ); SysFreeString( name ); + /* verify values set with _Append */ + hr = Field_get_Name( field, &name ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( name, L"field" ), "got %s\n", wine_dbgstr_w(name) ); + SysFreeString( name ); + type = 0xdead; + hr = Field_get_Type( field, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adInteger, "got %d\n", type ); + size = -1; + hr = Field_get_DefinedSize( field, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 4, "got %d\n", size ); + attrs = 0xdead; + hr = Field_get_Attributes( field, &attrs ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !attrs, "got %d\n", attrs ); + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset );

1 0

Hans Leidekker : msado15: Implement Field_get_Value and Field_put_Value.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: d5f77d6db70bda8e67eb58d1b35cbf058548194a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f77d6db70bda8e67eb58d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 12 17:12:24 2019 +0100 msado15: Implement Field_get_Value and Field_put_Value. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 67 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b262243d89..b214f9d077 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -36,7 +36,12 @@ struct recordset { _Recordset Recordset_iface; LONG refs; + LONG state; struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -187,16 +192,51 @@ static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) return S_OK; } +static LONG get_column_count( struct recordset *recordset ) +{ + return recordset->fields->count; +} + static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) { - FIXME( "%p, %p\n", iface, val ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %p\n", field, val ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &field->recordset->data[row * col_count + col] )) != S_OK) return hr; + + *val = copy; + return S_OK; } static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&val) ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %s\n", field, debugstr_variant(&val) ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &val )) != S_OK) return hr; + + field->recordset->data[row * col_count + col] = copy; + return S_OK; } static HRESULT WINAPI field_get_Precision( Field *iface, unsigned char *precision ) @@ -614,6 +654,22 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) return refs; } +static void close_recordset( struct recordset *recordset ) +{ + ULONG row, col, col_count = get_column_count( recordset ); + + recordset->fields->recordset = NULL; + Fields_Release( &recordset->fields->Fields_iface ); + recordset->fields = NULL; + + for (row = 0; row < recordset->count; row++) + for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); + + recordset->count = recordset->allocated = recordset->index = 0; + heap_free( recordset->data ); + recordset->data = NULL; +} + static ULONG WINAPI recordset_Release( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -622,7 +678,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) if (!refs) { TRACE( "destroying %p\n", recordset ); - recordset->fields->recordset = NULL; + close_recordset( recordset ); heap_free( recordset ); } return refs; @@ -1264,6 +1320,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; + recordset->index = -1; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj );

1 0

Hans Leidekker : msado15: Implement _Recordset_Open and _Recordset_Close.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 554502d6aaf29b7e1842b3384514377f0c721586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554502d6aaf29b7e1842b338… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 12 17:12:25 2019 +0100 msado15: Implement _Recordset_Open and _Recordset_Close. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b214f9d077..e854b3e824 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -901,8 +901,13 @@ static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) static HRESULT WINAPI recordset_Close( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + close_recordset( recordset ); + recordset->state = adStateClosed; + return S_OK; } static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_records ) @@ -950,9 +955,13 @@ static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { - FIXME( "%p, %s, %s, %d, %d, %d\n", iface, debugstr_variant(&source), debugstr_variant(&active_connection), + struct recordset *recordset = impl_from_Recordset( iface ); + + FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - return E_NOTIMPL; + + recordset->state = adStateOpen; + return S_OK; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options )

1 0

Henri Verbeet : wined3d: Pass a pointer to the counter buffer to wined3d_view_gl_destroy().
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 5d4d5c593d7526214bfa688122dcdd36a3a0a802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4d5c593d7526214bfa6881… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 21:21:01 2019 +0330 wined3d: Pass a pointer to the counter buffer to wined3d_view_gl_destroy(). If adapter_gl_destroy_unordered_access_view() is called before wined3d_unordered_access_view_gl_cs_init() has finished executing, the "counter_bo" field may still be 0. More generally, we shouldn't access the "counter_bo" field from outside the CS thread. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a8a8e93c0b..7e6f8a2817 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4801,7 +4801,7 @@ struct wined3d_view_gl_destroy_ctx { struct wined3d_device *device; const struct wined3d_gl_view *gl_view; - GLuint counter_bo; + GLuint *counter_bo; void *object; struct wined3d_view_gl_destroy_ctx *free; }; @@ -4825,7 +4825,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (ctx->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &ctx->counter_bo)); + GL_EXTCALL(glDeleteBuffers(1, ctx->counter_bo)); checkGLcall("delete resources"); context_release(context); } @@ -4835,7 +4835,7 @@ static void wined3d_view_gl_destroy_object(void *object) } static void wined3d_view_gl_destroy(struct wined3d_device *device, - const struct wined3d_gl_view *gl_view, GLuint counter_bo, void *object) + const struct wined3d_gl_view *gl_view, GLuint *counter_bo, void *object) { struct wined3d_view_gl_destroy_ctx *ctx, c; @@ -4867,7 +4867,7 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4913,7 +4913,7 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour if (swapchain_count) wined3d_device_incref(device); wined3d_shader_resource_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4959,7 +4959,7 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac if (swapchain_count) wined3d_device_incref(device); wined3d_unordered_access_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl->counter_bo, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, &view_gl->counter_bo, view_gl); if (swapchain_count) wined3d_device_decref(device); }

1 0

Henri Verbeet : wined3d: Destroy GPU resources from the CS thread in adapter_vk_uninit_3d().
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: c447029d154b149bfce9dacb662872af8a354788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c447029d154b149bfce9dacb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 21:21:02 2019 +0330 wined3d: Destroy GPU resources from the CS thread in adapter_vk_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4a50129282..94eb1382c5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -448,27 +448,42 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return WINED3D_OK; } -static void adapter_vk_uninit_3d(struct wined3d_device *device) +static void adapter_vk_uninit_3d_cs(void *object) { + struct wined3d_device_vk *device_vk = object; struct wined3d_context_vk *context_vk; + struct wined3d_device *device; struct wined3d_shader *shader; - TRACE("device %p.\n", device); + TRACE("device_vk %p.\n", device_vk); - context_vk = &wined3d_device_vk(device)->context_vk; + context_vk = &device_vk->context_vk; + device = &device_vk->d; LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); } + device->blitter->ops->blitter_destroy(device->blitter, NULL); + device->shader_backend->shader_free_private(device, &context_vk->c); wined3d_device_destroy_default_samplers(device, &context_vk->c); +} - device->blitter->ops->blitter_destroy(device->blitter, NULL); +static void adapter_vk_uninit_3d(struct wined3d_device *device) +{ + struct wined3d_context_vk *context_vk; + struct wined3d_device_vk *device_vk; + + TRACE("device %p.\n", device); + device_vk = wined3d_device_vk(device); + context_vk = &device_vk->context_vk; + + wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device_context_remove(device, &context_vk->c); - device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); }

1 0

Henri Verbeet : wined3d: Avoid accessing gl_info in wined3d_buffer_init().
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 5b358e0f4c17c66eb7f8384dcbf25987b6e90612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b358e0f4c17c66eb7f8384d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 21:21:03 2019 +0330 wined3d: Avoid accessing gl_info in wined3d_buffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 89dab8ebfd..35248ce9fa 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1311,9 +1311,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; - BOOL dynamic_buffer_ok; HRESULT hr; TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " @@ -1364,28 +1362,6 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer->locations = WINED3D_LOCATION_SYSMEM; } - /* Observations show that draw_primitive_immediate_mode() is faster on - * dynamic vertex buffers than converting + draw_primitive_arrays(). - * (Half-Life 2 and others.) */ - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; - - if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) - { - TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); - } - else if (!(desc->access & WINED3D_RESOURCE_ACCESS_GPU)) - { - TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); - } - else if (!dynamic_buffer_ok && (resource->usage & WINED3DUSAGE_DYNAMIC)) - { - TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); - } - else - { - buffer->flags |= WINED3D_BUFFER_USE_BO; - } - if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) { if (!wined3d_resource_prepare_sysmem(&buffer->resource)) @@ -1557,6 +1533,18 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined TRACE("buffer_gl %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_gl, device, desc, data, parent, parent_ops); + /* Observations show that draw_primitive_immediate_mode() is faster on + * dynamic vertex buffers than converting + draw_primitive_arrays(). + * (Half-Life 2 and others.) */ + if (!(desc->access & WINED3D_RESOURCE_ACCESS_GPU)) + TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); + else if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) + TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); + else if (!(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]) + && (desc->usage & WINED3DUSAGE_DYNAMIC)) + TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); + else + buffer_gl->b.flags |= WINED3D_BUFFER_USE_BO; buffer_gl->buffer_type_hint = wined3d_buffer_gl_binding_from_bind_flags(gl_info, desc->bind_flags); return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops);

1 0

Henri Verbeet : wined3d: Introduce WINED3D_BIND_INDIRECT_BUFFER.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: cf442832276b0368ad19c21c6ca784da9562eb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf442832276b0368ad19c21c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 21:21:04 2019 +0330 wined3d: Introduce WINED3D_BIND_INDIRECT_BUFFER. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 25 ++++++++++++++++++++++--- dlls/d3d11/texture.c | 6 +++--- dlls/wined3d/buffer.c | 4 ++++ dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 1 + 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ed9ee13311..f2b950f357 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -448,7 +448,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(buffer->desc.Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(buffer->desc.BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(buffer->desc.BindFlags, buffer->desc.MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(buffer->desc.Usage, buffer->desc.CPUAccessFlags); wined3d_desc.misc_flags = buffer->desc.MiscFlags; wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 22196809b6..1e8d86fede 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -92,14 +92,33 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; -static inline unsigned int wined3d_bind_flags_from_d3d11(UINT bind_flags) +static inline unsigned int wined3d_bind_flags_from_d3d11(UINT bind_flags, UINT misc_flags) { - return bind_flags; + unsigned int wined3d_flags = bind_flags & (D3D11_BIND_VERTEX_BUFFER + | D3D11_BIND_INDEX_BUFFER + | D3D11_BIND_CONSTANT_BUFFER + | D3D11_BIND_SHADER_RESOURCE + | D3D11_BIND_STREAM_OUTPUT + | D3D11_BIND_RENDER_TARGET + | D3D11_BIND_DEPTH_STENCIL + | D3D11_BIND_UNORDERED_ACCESS); + + if (misc_flags & D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS) + wined3d_flags |= WINED3D_BIND_INDIRECT_BUFFER; + + return wined3d_flags; } static inline UINT d3d11_bind_flags_from_wined3d(unsigned int bind_flags) { - return bind_flags; + return bind_flags & (WINED3D_BIND_VERTEX_BUFFER + | WINED3D_BIND_INDEX_BUFFER + | WINED3D_BIND_CONSTANT_BUFFER + | WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_STREAM_OUTPUT + | WINED3D_BIND_RENDER_TARGET + | WINED3D_BIND_DEPTH_STENCIL + | WINED3D_BIND_UNORDERED_ACCESS); } /* ID3D11Texture1D, ID3D10Texture1D */ diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index d54f22f35c..36d07beb23 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -454,7 +454,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags, desc->MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; @@ -1008,7 +1008,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags, desc->MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; @@ -1467,7 +1467,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags, desc->MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 35248ce9fa..5da6aec4fb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1300,6 +1300,10 @@ GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *g if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) return GL_TRANSFORM_FEEDBACK_BUFFER; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER + && gl_info->supported[ARB_DRAW_INDIRECT]) + return GL_DRAW_INDIRECT_BUFFER; + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) FIXME("Unhandled bind flags %#x.\n", bind_flags); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 453bee6256..d5fe1c239b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4687,6 +4687,7 @@ const char *wined3d_debug_bind_flags(DWORD bind_flags) BIND_FLAG_TO_STR(WINED3D_BIND_RENDER_TARGET); BIND_FLAG_TO_STR(WINED3D_BIND_DEPTH_STENCIL); BIND_FLAG_TO_STR(WINED3D_BIND_UNORDERED_ACCESS); + BIND_FLAG_TO_STR(WINED3D_BIND_INDIRECT_BUFFER); #undef BIND_FLAG_TO_STR if (bind_flags) FIXME("Unrecognised bind flag(s) %#x.\n", bind_flags); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db88e11032..9cdf18633c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,6 +914,7 @@ enum wined3d_shader_type #define WINED3D_BIND_RENDER_TARGET 0x00000020 #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 +#define WINED3D_BIND_INDIRECT_BUFFER 0x00000100 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 #define WINED3DUSAGE_DONOTCLIP 0x00000020

1 0

Henri Verbeet : wined3d: Store Vulkan physical device memory properties in the wined3d_adapter_vk structure.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 663854bcae87278518a18080b3cda4d675c55f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=663854bcae87278518a18080… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 21:21:05 2019 +0330 wined3d: Store Vulkan physical device memory properties in the wined3d_adapter_vk structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 94eb1382c5..4ec6801301 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1100,9 +1100,10 @@ static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor } } -static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, - const VkPhysicalDeviceProperties *properties, const VkPhysicalDeviceMemoryProperties *memory_properties) +static void adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, + const VkPhysicalDeviceProperties *properties) { + const VkPhysicalDeviceMemoryProperties *memory_properties = &adapter_vk->memory_properties; const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; UINT64 vram_bytes, sysmem_bytes; @@ -1144,7 +1145,7 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, gpu_description = &description; } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes, sysmem_bytes); + wined3d_driver_info_init(&adapter_vk->a.driver_info, gpu_description, vram_bytes, sysmem_bytes); } static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter *adapter, uint32_t wined3d_creation_flags) @@ -1162,7 +1163,6 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - VkPhysicalDeviceMemoryProperties memory_properties; struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; @@ -1193,9 +1193,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); adapter_vk->device_limits = properties2.properties.limits; - VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties)); + VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &adapter_vk->memory_properties)); - adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties); + adapter_vk_init_driver_info(adapter_vk, &properties2.properties); adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b73d5c7fec..21f17736ec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,7 @@ struct wined3d_adapter_vk VkPhysicalDevice physical_device; VkPhysicalDeviceLimits device_limits; + VkPhysicalDeviceMemoryProperties memory_properties; }; static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter)

1 0

Andrey Gusev : ntoskrnl.exe/tests: Fix typos in ok() messages.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 8cd122549700df441a515eb5efc8aa88af0491ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd122549700df441a515eb5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 12 17:55:11 2019 +0200 ntoskrnl.exe/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6827b74a3c..10f3865515 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -800,7 +800,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); @@ -824,7 +824,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); ok(status == STATUS_TIMEOUT, "got %#x\n", status);

1 0