November 2016 - Wine-Commits

Józef Kucia : wined3d: Use wined3d_texture_upload_data() in wined3d_device_update_sub_resource() .
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 76d101b85c8e1b276b8e80ee206d96227291bed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d101b85c8e1b276b8e80ee2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:17 2016 +0100 wined3d: Use wined3d_texture_upload_data() in wined3d_device_update_sub_resource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e2ae908..6e10dce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4063,15 +4063,10 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch) { - struct wined3d_texture_sub_resource *sub_resource; - const struct wined3d_gl_info *gl_info; struct wined3d_const_bo_address addr; unsigned int width, height, level; struct wined3d_context *context; struct wined3d_texture *texture; - struct wined3d_surface *surface; - POINT dst_point; - RECT src_rect; TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u.\n", device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch); @@ -4100,57 +4095,37 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str } texture = texture_from_resource(resource); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + if (sub_resource_idx >= texture->level_count * texture->layer_count) { WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); return; } - surface = sub_resource->u.surface; level = sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); - src_rect.left = 0; - src_rect.top = 0; - if (box) + if (box && (box->left >= box->right || box->right > width + || box->top >= box->bottom || box->bottom > height + || box->front >= box->back)) { - if (box->left >= box->right || box->right > width - || box->top >= box->bottom || box->bottom > height - || box->front >= box->back) - { - WARN("Invalid box %s specified.\n", debug_box(box)); - return; - } - - src_rect.right = box->right - box->left; - src_rect.bottom = box->bottom - box->top; - dst_point.x = box->left; - dst_point.y = box->top; - } - else - { - src_rect.right = width; - src_rect.bottom = height; - dst_point.x = 0; - dst_point.y = 0; + WARN("Invalid box %s specified.\n", debug_box(box)); + return; } addr.buffer_object = 0; addr.addr = data; context = context_acquire(resource->device, NULL); - gl_info = context->gl_info; /* Only load the surface for partial updates. */ - if (!dst_point.x && !dst_point.y && src_rect.right == width && src_rect.bottom == height) + if (!box || (!box->left && !box->top && box->right == width && box->bottom == height)) wined3d_texture_prepare_texture(texture, context, FALSE); else wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); - wined3d_surface_upload_data(surface, gl_info, resource->format, - &src_rect, row_pitch, &dst_point, FALSE, &addr); + wined3d_texture_upload_data(texture, sub_resource_idx, context, box, &addr, row_pitch, depth_pitch); context_release(context);

1 0

Józef Kucia : wined3d: Extend wined3d_texture_upload_data() to support partial uploads.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: e0d30e8e03d3531ce78b41f08043cf372477c284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d30e8e03d3531ce78b41f08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:16 2016 +0100 wined3d: Extend wined3d_texture_upload_data() to support partial uploads. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 49 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 8 +++---- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d7349fcf..e2ae908 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3602,7 +3602,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, data.buffer_object = 0; data.addr = src.data; - wined3d_texture_upload_data(dst_texture, i, context, &data, src.row_pitch, src.slice_pitch); + wined3d_texture_upload_data(dst_texture, i, context, NULL, &data, src.row_pitch, src.slice_pitch); wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i))) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c82016e5..59468f5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1436,24 +1436,37 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data, - unsigned int row_pitch, unsigned int slice_pitch) + const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, - context, data, row_pitch, slice_pitch); + context, box, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data, - unsigned int row_pitch, unsigned int slice_pitch) + const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { - static const POINT dst_point = {0, 0}; unsigned int texture_level; + POINT dst_point; RECT src_rect; - texture_level = sub_resource_idx % texture->level_count; - SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), - wined3d_texture_get_level_height(texture, texture_level)); + src_rect.left = 0; + src_rect.top = 0; + if (box) + { + dst_point.x = box->left; + dst_point.y = box->top; + src_rect.right = box->right - box->left; + src_rect.bottom = box->bottom - box->top; + } + else + { + dst_point.x = dst_point.y = 0; + texture_level = sub_resource_idx % texture->level_count; + src_rect.right = wined3d_texture_get_level_width(texture, texture_level); + src_rect.bottom = wined3d_texture_get_level_height(texture, texture_level); + } wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); @@ -2093,8 +2106,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data, - unsigned int row_pitch, unsigned int slice_pitch) + const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { const struct wined3d_format *format = texture->resource.format; unsigned int level = sub_resource_idx % texture->level_count; @@ -2104,8 +2117,12 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int const void *mem = data->addr; void *converted_mem = NULL; - TRACE("texture %p, sub_resource_idx %u, context %p, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", - texture, sub_resource_idx, context, data->buffer_object, data->addr, row_pitch, slice_pitch); + TRACE("texture %p, sub_resource_idx %u, context %p, box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", + texture, sub_resource_idx, context, debug_box(box), + data->buffer_object, data->addr, row_pitch, slice_pitch); + + if (box) + FIXME("Partial upload not supported yet.\n"); width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); @@ -2208,7 +2225,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); + NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch); HeapFree(GetProcessHeap(), 0, data.addr); } @@ -2261,7 +2278,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2269,7 +2286,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 449ca3c..a363103 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2649,8 +2649,8 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data, - unsigned int row_pitch, unsigned int slice_pitch); + const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void (*texture_prepare_texture)(struct wined3d_texture *texture, @@ -2807,8 +2807,8 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, const struct wined3d_gl_info *gl_info, GLenum binding) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_const_bo_address *data, - unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; + const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : oledb32: Use growing array to store error records.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 4a3054e445e86472a3e4b5d12a2718708c863df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3054e445e86472a3e4b5d12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 20:26:47 2016 +0300 oledb32: Use growing array to store error records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 65 ++++++++++++++++++++++++++++---------------- dlls/oledb32/oledb_private.h | 5 ++++ 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 4a56b46..0875d82 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); struct ErrorEntry { - struct list entry; ERRORINFO info; DISPPARAMS dispparams; IUnknown *unknown; @@ -53,7 +52,9 @@ typedef struct ErrorInfoImpl IErrorRecords IErrorRecords_iface; LONG ref; - struct list errors; + struct ErrorEntry *records; + unsigned int allocated; + unsigned int count; } ErrorInfoImpl; static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) @@ -103,20 +104,19 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); - struct ErrorEntry *cursor, *cursor2; TRACE("(%p)->%u\n",This,ref+1); if (!ref) { - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->errors, struct ErrorEntry, entry) - { - list_remove(&cursor->entry); - if(cursor->unknown) - IUnknown_Release(cursor->unknown); + unsigned int i; - heap_free(cursor); + for (i = 0; i < This->count; i++) + { + if (This->records[i].unknown) + IUnknown_Release(This->records[i].unknown); } + heap_free(This->records); heap_free(This); } return ref; @@ -233,10 +233,27 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p if(!pErrorInfo) return E_INVALIDARG; - entry = heap_alloc(sizeof(*entry)); - if(!entry) - return E_OUTOFMEMORY; + if (!This->records) + { + const unsigned int initial_size = 16; + if (!(This->records = heap_alloc(initial_size * sizeof(*This->records)))) + return E_OUTOFMEMORY; + + This->allocated = initial_size; + } + else if (This->count == This->allocated) + { + struct ErrorEntry *new_ptr; + + new_ptr = heap_realloc(This->records, 2 * This->allocated * sizeof(*This->records)); + if (!new_ptr) + return E_OUTOFMEMORY; + + This->records = new_ptr; + This->allocated *= 2; + } + entry = This->records + This->count; entry->info = *pErrorInfo; if(pdispparams) entry->dispparams = *pdispparams; @@ -245,7 +262,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p IUnknown_AddRef(entry->unknown); entry->lookupID = dwDynamicErrorID; - list_add_head(&This->errors, &entry->entry); + This->count++; return S_OK; } @@ -260,7 +277,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ulR if(!pErrorInfo) return E_INVALIDARG; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; @@ -278,7 +295,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG *ppObject = NULL; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; @@ -294,7 +311,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG ulRecord if (!ppErrorInfo) return E_INVALIDARG; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; @@ -310,24 +327,24 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG ul if (!pdispparams) return E_INVALIDARG; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; } -static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *records) +static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - TRACE("(%p)->(%p)\n", This, records); + TRACE("(%p)->(%p)\n", This, count); - if(!records) + if(!count) return E_INVALIDARG; - *records = list_count(&This->errors); + *count = This->count; - TRACE("<--(%d)\n", *records); + TRACE("<--(%u)\n", *count); return S_OK; } @@ -362,7 +379,9 @@ HRESULT create_error_info(IUnknown *outer, void **obj) This->IErrorRecords_iface.lpVtbl = &ErrorRecordsVtbl; This->ref = 1; - list_init(&This->errors); + This->records = NULL; + This->allocated = 0; + This->count = 0; *obj = &This->IErrorInfo_iface; diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 1422b0b..8b1a40f 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -33,6 +33,11 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline void *heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len);

1 0

Stefan Dösinger : ddraw: Implement executebuffer point and line draws.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 59c4d8581d3fe576f86f03a2532a0cf975abeebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c4d8581d3fe576f86f03a25… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 13 15:12:47 2016 -0600 ddraw: Implement executebuffer point and line draws. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 70 +++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 44751b9..09226cd 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -53,7 +53,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, { DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; - unsigned int i; + unsigned int i, primitive_size; struct wined3d_map_desc map_desc; struct wined3d_box box = {0}; HRESULT hr; @@ -81,31 +81,51 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, count = current->wCount; size = current->bSize; instr += sizeof(D3DINSTRUCTION); - - switch (current->bOpcode) { - case D3DOP_POINT: { - WARN("POINT-s (%d)\n", count); - instr += count * size; - } break; + primitive_size = 0; - case D3DOP_LINE: { - WARN("LINE-s (%d)\n", count); - instr += count * size; - } break; + switch (current->bOpcode) + { + case D3DOP_POINT: + { + const D3DPOINT *p = (D3DPOINT *)instr; + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST); + wined3d_device_set_stream_source(device->wined3d_device, 0, + buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); + wined3d_device_set_vertex_declaration(device->wined3d_device, + ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); + for (i = 0; i < count; ++i) + wined3d_device_draw_primitive(device->wined3d_device, p[i].wFirst, p[i].wCount); + + instr += sizeof(*p) * count; + break; + } + + case D3DOP_LINE: + primitive_size = 2; + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_LINELIST); + /* Drop through. */ case D3DOP_TRIANGLE: { WORD *indices; - unsigned int index_pos = buffer->index_pos; + unsigned int index_pos = buffer->index_pos, index_count; TRACE("TRIANGLE (%d)\n", count); if (!count) break; - if (buffer->index_size < count * 3) + if (!primitive_size) + { + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_TRIANGLELIST); + primitive_size = 3; + } + + index_count = count * primitive_size; + + if (buffer->index_size < index_count) { struct wined3d_buffer *new_buffer; - unsigned int new_size = max(buffer->index_size * 2, count * 3); + unsigned int new_size = max(buffer->index_size * 2, index_count); hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices), WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, @@ -119,13 +139,13 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, buffer->index_buffer = new_buffer; index_pos = 0; } - else if (buffer->index_size - count * 3 < index_pos) + else if (buffer->index_size - index_count < index_pos) { index_pos = 0; } box.left = index_pos * sizeof(*indices); - box.right = (index_pos + count * 3) * sizeof(*indices); + box.right = (index_pos + index_count) * sizeof(*indices); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->index_buffer), 0, &map_desc, &box, index_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) @@ -157,9 +177,16 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, TRACE("STARTFLAT(%u) ", ci->wFlags); TRACE("\n"); } - indices[(i * 3) ] = ci->u1.v1; - indices[(i * 3) + 1] = ci->u2.v2; - indices[(i * 3) + 2] = ci->u3.v3; + + switch (primitive_size) + { + case 3: + indices[(i * primitive_size) + 2] = ci->u3.v3; + /* Drop through. */ + case 2: + indices[(i * primitive_size) + 1] = ci->u2.v2; + indices[(i * primitive_size) ] = ci->u1.v1; + } instr += size; } @@ -170,10 +197,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); wined3d_device_set_index_buffer(device->wined3d_device, buffer->index_buffer, WINED3DFMT_R16_UINT, 0); - wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_TRIANGLELIST); - wined3d_device_draw_indexed_primitive(device->wined3d_device, index_pos, count * 3); + wined3d_device_draw_indexed_primitive(device->wined3d_device, index_pos, index_count); - buffer->index_pos = index_pos + count * 3; + buffer->index_pos = index_pos + index_count; break; }

1 0

Stefan Dösinger : ddraw: Avoid redundant src vertex buffer discards.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 15fc10a728c58bb407d2fca2c2829940f75aa41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fc10a728c58bb407d2fca2c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 13 15:12:46 2016 -0600 ddraw: Avoid redundant src vertex buffer discards. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/executebuffer.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2f8737b..fe4603b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -524,7 +524,7 @@ struct d3d_execute_buffer /* This buffer will store the transformed vertices */ unsigned int index_size, index_pos; - unsigned int vertex_size; + unsigned int vertex_size, src_vertex_pos; struct wined3d_buffer *src_vertex_buffer, *dst_vertex_buffer, *index_buffer; /* This flags is set to TRUE if we allocated ourselves the diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 3ed18f1..44751b9 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -285,7 +285,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: wined3d_device_set_stream_source(device->wined3d_device, 0, - buffer->src_vertex_buffer, 0, sizeof(D3DVERTEX)); + buffer->src_vertex_buffer, buffer->src_vertex_pos, sizeof(D3DVERTEX)); if (op == D3DPROCESSVERTICES_TRANSFORMLIGHT) { wined3d_device_set_vertex_declaration(device->wined3d_device, @@ -306,8 +306,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DPROCESSVERTICES_COPY: - box.left = ci->wStart * sizeof(D3DTLVERTEX); - box.right = (ci->wStart + ci->dwCount) * sizeof(D3DTLVERTEX); + box.left = (buffer->src_vertex_pos + ci->wStart) * sizeof(D3DTLVERTEX); + box.right = box.left + ci->dwCount * sizeof(D3DTLVERTEX); box.top = box.front = 0; box.bottom = box.back = 1; wined3d_device_copy_sub_resource_region(device->wined3d_device, @@ -559,6 +559,9 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + /* Skip past previous vertex data. */ + buffer->src_vertex_pos += buffer->data.dwVertexCount; + if (buffer->vertex_size < data->dwVertexCount) { unsigned int new_size = max(data->dwVertexCount, buffer->vertex_size * 2); @@ -587,18 +590,24 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * buffer->src_vertex_buffer = src_buffer; buffer->dst_vertex_buffer = dst_buffer; buffer->vertex_size = new_size; + buffer->src_vertex_pos = 0; + } + else if (buffer->vertex_size - data->dwVertexCount < buffer->src_vertex_pos) + { + buffer->src_vertex_pos = 0; } if (data->dwVertexCount) { - box.left = 0; - box.right = data->dwVertexCount * sizeof(D3DVERTEX); + box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); + box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, - &map_desc, &box, WINED3D_MAP_DISCARD); + &map_desc, &box, buffer->src_vertex_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) return hr; - memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, box.right); + memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, + data->dwVertexCount * sizeof(D3DVERTEX)); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0); }

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16_SNORM format.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: dbef90793a9cee1dbb2bbc6e73d26ae5df3edff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbef90793a9cee1dbb2bbc6e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:20 2016 +0100 wined3d: Add support for WINED3DFMT_R16_SNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index afbfd92..5530aad 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -246,6 +246,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R8G8_UINT, WINED3DFMT_R8G8_TYPELESS, "UU"}, {WINED3DFMT_R8G8_SINT, WINED3DFMT_R8G8_TYPELESS, "II"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, + {WINED3DFMT_R16_SNORM, WINED3DFMT_R16_TYPELESS, "i"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, @@ -1478,6 +1479,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, + {WINED3DFMT_R16_SNORM, GL_R16_SNORM, GL_R16_SNORM, 0, + GL_RED, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0,

1 0

Józef Kucia : d3d11: Lie about threading support.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 2428a9d237149c932aaae7ba07387af413b985c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2428a9d237149c932aaae7ba0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:19 2016 +0100 d3d11: Lie about threading support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 72e6a71..99991b4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2780,8 +2780,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * return E_INVALIDARG; } - threading_data->DriverConcurrentCreates = FALSE; - threading_data->DriverCommandLists = FALSE; + /* We lie about the threading support to make Tomb Raider 2013 and + * Deus Ex: Human Revolution happy. */ + FIXME("Returning fake threading support data.\n"); + threading_data->DriverConcurrentCreates = TRUE; + threading_data->DriverCommandLists = TRUE; return S_OK; } case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS:

1 0

Józef Kucia : wined3d: Implement wined3d_update_sub_resource() for 3D textures.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 685246b4a17732cb2f7f3f483e3bd5a4f61c8f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685246b4a17732cb2f7f3f483… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:18 2016 +0100 wined3d: Implement wined3d_update_sub_resource() for 3D textures. Fixes a regression introduced by commit e58689a3981fae5b312b12e9f6801adf289d04c0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 12 +++++++----- dlls/wined3d/texture.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e10dce..90ac18a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4063,8 +4063,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch) { + unsigned int width, height, depth, level; struct wined3d_const_bo_address addr; - unsigned int width, height, level; struct wined3d_context *context; struct wined3d_texture *texture; @@ -4088,7 +4088,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str return; } - if (resource->type != WINED3D_RTYPE_TEXTURE_2D) + if (resource->type != WINED3D_RTYPE_TEXTURE_2D && resource->type != WINED3D_RTYPE_TEXTURE_3D) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return; @@ -4104,10 +4104,11 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str level = sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); + depth = wined3d_texture_get_level_depth(texture, level); if (box && (box->left >= box->right || box->right > width || box->top >= box->bottom || box->bottom > height - || box->front >= box->back)) + || box->front >= box->back || box->back > depth)) { WARN("Invalid box %s specified.\n", debug_box(box)); return; @@ -4118,8 +4119,9 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str context = context_acquire(resource->device, NULL); - /* Only load the surface for partial updates. */ - if (!box || (!box->left && !box->top && box->right == width && box->bottom == height)) + /* Only load the sub-resource for partial updates. */ + if (!box || (!box->left && !box->top && !box->front + && box->right == width && box->bottom == height && box->back == depth)) wined3d_texture_prepare_texture(texture, context, FALSE); else wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 59468f5..4a572ab 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2112,6 +2112,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int const struct wined3d_format *format = texture->resource.format; unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int x, y, z, update_w, update_h, update_d; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int width, height, depth; const void *mem = data->addr; @@ -2121,13 +2122,27 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int texture, sub_resource_idx, context, debug_box(box), data->buffer_object, data->addr, row_pitch, slice_pitch); - if (box) - FIXME("Partial upload not supported yet.\n"); - width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); depth = wined3d_texture_get_level_depth(texture, level); + if (!box) + { + x = y = z = 0; + update_w = width; + update_h = height; + update_d = depth; + } + else + { + x = box->left; + y = box->top; + z = box->front; + update_w = box->right - box->left; + update_h = box->bottom - box->top; + update_d = box->back - box->front; + } + if (format->convert) { if (data->buffer_object) @@ -2135,12 +2150,12 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); - dst_row_pitch = width * format->conv_byte_count; - dst_slice_pitch = dst_row_pitch * height; + dst_row_pitch = update_w * format->conv_byte_count; + dst_slice_pitch = dst_row_pitch * update_h; - converted_mem = wined3d_calloc(depth, dst_slice_pitch); + converted_mem = wined3d_calloc(update_d, dst_slice_pitch); format->convert(data->addr, converted_mem, row_pitch, slice_pitch, - dst_row_pitch, dst_slice_pitch, width, height, depth); + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); mem = converted_mem; } else @@ -2156,8 +2171,8 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int checkGLcall("glBindBuffer"); } - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, 0, 0, 0, - width, height, depth, format->glFormat, format->glType, mem)); + GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, x, y, z, + update_w, update_h, update_d, format->glFormat, format->glType, mem)); checkGLcall("glTexSubImage3D"); if (data->buffer_object)

1 0

Erich E. Hoover : user32/tests: Fix an inconsistent test case in clearing the clipboard.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: f9b878101e1c44588cea32f74ca74c0ad2c4b75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b878101e1c44588cea32f74… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sat Nov 12 16:26:45 2016 -0700 user32/tests: Fix an inconsistent test case in clearing the clipboard. Depending on our clipboard polling we can get an additional clipboard update during the clipboard clear test. This change forces a consistent state when starting the test, which stops the additional window message from possibly occurring. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b132dfe..45b5222 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14054,6 +14054,7 @@ static void test_clipboard_viewers(void) trace("clipbd viewers: hWnd1=%p, hWnd2=%p, hWnd3=%p\n", hWnd1, hWnd2, hWnd3); assert(hWnd1 && hWnd2 && hWnd3); + CountClipboardFormats(); /* Ensure that we do not have an X11 update to the clipboard */ flush_sequence(); /* Test getting the clipboard viewer and setting the viewer to NULL. */

1 0

Grazvydas Ignotas : wined3d: Add Polaris GPUs and their driver.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: c63e3261f37e8116e59c70b9bed20aa90c39e8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63e3261f37e8116e59c70b9b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Mon Nov 14 00:10:00 2016 +0200 wined3d: Add Polaris GPUs and their driver. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a8c8c9f..6588d1c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -45,6 +45,7 @@ enum wined3d_display_driver DRIVER_AMD_R100, DRIVER_AMD_R300, DRIVER_AMD_R600, + DRIVER_AMD_RX, DRIVER_INTEL_GMA800, DRIVER_INTEL_GMA900, DRIVER_INTEL_GMA950, @@ -1160,6 +1161,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 17, 10, 1474}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1367,7 +1369,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_R600, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, @@ -2109,6 +2113,9 @@ cards_intel[] = * These are returned but not handled: RC410, RV380. */ cards_amd_mesa[] = { + /* Polaris 10/11 */ + {"POLARIS10", CARD_AMD_RADEON_RX_480}, + {"POLARIS11", CARD_AMD_RADEON_RX_460}, /* Sea Islands */ {"HAWAII", CARD_AMD_RADEON_R9 }, {"KAVERI", CARD_AMD_RADEON_R7 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e742f6..449ca3c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1843,6 +1843,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_RX_460 = 0x67ef, + CARD_AMD_RADEON_RX_480 = 0x67df, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0