November 2016 - Wine-commits

Aric Stewart : hidclass.sys: Handle POP and PUSH in device descriptors.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 3b3b7670ec0a7d3ba207d1588dac2e6d26b51236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3b7670ec0a7d3ba207d1588… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 08:29:20 2016 -0600 hidclass.sys: Handle POP and PUSH in device descriptors. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 50 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9a26f0f4..e1c48dd 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -172,6 +172,11 @@ struct collection { struct list collections; }; +struct caps_stack { + struct list entry; + struct caps caps; +}; + static const char* debugstr_usages(struct caps *caps) { if (!caps->IsRange) @@ -458,7 +463,10 @@ static void new_caps(struct caps *caps) caps->usage_count = 0; } -static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *feature_index, unsigned int *collection_index, struct collection *collection, struct caps *caps, struct list *features) +static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int length, + unsigned int *feature_index, unsigned int *collection_index, + struct collection *collection, struct caps *caps, + struct list *features, struct list *stack) { unsigned int i; for (i = index; i < length;) @@ -544,7 +552,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l parse_collection(bSize, itemVal, subcollection); - i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features); + i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features, stack); continue; } case TAG_MAIN_END_COLLECTION: @@ -588,11 +596,30 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->ReportCount = getValue(bSize, itemVal); break; case TAG_GLOBAL_PUSH: - FIXME("Unhandled Push\n"); + { + struct caps_stack *saved = HeapAlloc(GetProcessHeap(), 0, sizeof(*saved)); + saved->caps = *caps; + TRACE("Push\n"); + list_add_tail(stack, &saved->entry); break; + } case TAG_GLOBAL_POP: - FIXME("Unhandled Pop\n"); + { + struct list *tail; + struct caps_stack *saved; + TRACE("Pop\n"); + tail = list_tail(stack); + if (tail) + { + saved = LIST_ENTRY(tail, struct caps_stack, entry); + *caps = saved->caps; + list_remove(tail); + HeapFree(GetProcessHeap(), 0, saved); + } + else + ERR("Pop but no stack!\n"); break; + } default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); } @@ -1020,6 +1047,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct caps caps; struct list features; + struct list caps_stack; unsigned int feature_count = 0; unsigned int cidx; @@ -1037,6 +1065,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) } list_init(&features); + list_init(&caps_stack); base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); base->index = 1; @@ -1045,10 +1074,21 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) memset(&caps, 0, sizeof(caps)); cidx = 0; - parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features); + parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features, &caps_stack); debug_collection(base); + if (!list_empty(&caps_stack)) + { + struct caps_stack *entry, *cursor; + ERR("%i unpopped device caps on the stack\n", list_count(&caps_stack)); + LIST_FOR_EACH_ENTRY_SAFE(entry, cursor, &caps_stack, struct caps_stack, entry) + { + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); + } + } + cidx = 2; if (feature_count) {

1 0

Aric Stewart : hidclass.sys: Handle descriptors with a usage count less than the report bits.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 437f7a372205e9218e279abed1f9ad85980c3d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437f7a372205e9218e279abed… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 07:18:34 2016 -0600 hidclass.sys: Handle descriptors with a usage count less than the report bits. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index e1c48dd..9a80f68 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -752,7 +752,12 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.HasNull = feature->HasNull; wine_element->caps.value.BitSize = feature->caps.BitSize; if (feature->caps.usage_count > 1) - wine_element->caps.value.ReportCount = 1; + { + if (feature->caps.ReportCount > feature->caps.usage_count) + wine_element->caps.value.ReportCount = feature->caps.ReportCount / feature->caps.usage_count; + else + wine_element->caps.value.ReportCount = 1; + } else wine_element->caps.value.ReportCount = feature->caps.ReportCount; wine_element->bitCount = (feature->caps.BitSize * wine_element->caps.value.ReportCount);

1 0

Francois Gouget : crypt32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 38372d19f6ecd2658ed0a6d10f89c46c7675b6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38372d19f6ecd2658ed0a6d10… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 15 00:19:52 2016 +0100 crypt32/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 132a9da..a396dfe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -411,7 +411,7 @@ static void testRegStoreSavedCerts(void) skip("Insufficient privileges for the test %d\n", i); continue; } - ok (store!=NULL, "Failed to open the store at %d, %x", i, GetLastError()); + ok (store!=NULL, "Failed to open the store at %d, %x\n", i, GetLastError()); cert1 = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); ok (cert1 != NULL, "Create cert context failed at %d, %x\n", i, GetLastError()); ret = CertAddCertificateContextToStore(store, cert1, CERT_STORE_ADD_REPLACE_EXISTING, NULL); @@ -458,7 +458,7 @@ static void testRegStoreSavedCerts(void) /* deleting cert from store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, reg_store_saved_certs[i].cert_store, reg_store_saved_certs[i].store_name); - ok (store!=NULL, "Failed to open the store at %d, %x", i, GetLastError()); + ok (store!=NULL, "Failed to open the store at %d, %x\n", i, GetLastError()); cert1 = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); ok (cert1 != NULL, "Create cert context failed at %d, %x\n", i, GetLastError()); @@ -556,7 +556,7 @@ static void testStoresInCollection(void) ok (ret, "Failed to add rw_store_2 to collection %x\n",GetLastError()); cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, signedBigCert, sizeof(signedBigCert)); - ok (cert2 != NULL, "Failed to create cert context %x \n", GetLastError()); + ok (cert2 != NULL, "Failed to create cert context %x\n", GetLastError()); ret = CertAddCertificateContextToStore(collection, cert2, CERT_STORE_ADD_REPLACE_EXISTING, NULL); ok (ret, "Failed to add cert3 to the store %x\n",GetLastError()); @@ -2231,7 +2231,7 @@ static void testCertRegisterSystemStore(void) } ret = CertCloseStore(hstore, 0); - ok (ret, "CertCloseStore failed at %08x, last error %x", cur_flag, GetLastError()); + ok (ret, "CertCloseStore failed at %08x, last error %x\n", cur_flag, GetLastError()); ret = pCertUnregisterSystemStore(WineTestW, cur_flag ); todo_wine_if (reg_system_store_test_data[i].todo)

1 0

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

15 Nov '16

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

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

15 Nov '16

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

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

15 Nov '16

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: Implement wined3d_update_sub_resource() for 3D textures.
by Alexandre Julliard 15 Nov '16

15 Nov '16

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

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

15 Nov '16

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: Add support for WINED3DFMT_R16_SNORM format.
by Alexandre Julliard 15 Nov '16

15 Nov '16

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 : wined3d: Add support for WINED3DFMT_R8_SNORM format.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: c859158d649d500c8b21d2550ee84c7d2d9283ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c859158d649d500c8b21d2550… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:21 2016 +0100 wined3d: Add support for WINED3DFMT_R8_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 5530aad..0d90ad3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -252,6 +252,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, + {WINED3DFMT_R8_SNORM, WINED3DFMT_R8_TYPELESS, "i"}, {WINED3DFMT_R8_UINT, WINED3DFMT_R8_TYPELESS, "U"}, {WINED3DFMT_R8_SINT, WINED3DFMT_R8_TYPELESS, "I"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, @@ -1484,6 +1485,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, EXT_TEXTURE_SNORM, NULL}, + {WINED3DFMT_R8_SNORM, GL_R8_SNORM, GL_R8_SNORM, 0, + GL_RED, GL_BYTE, 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