August 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Allocate GPU BOs for discard maps on deferred contexts.
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: 8b5a3bc8325c4276686d5aa73353e4f7a2253670 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b5a3bc8325c4276686d5aa73353e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 15 15:31:12 2023 -0500 wined3d: Allocate GPU BOs for discard maps on deferred contexts. --- dlls/wined3d/cs.c | 80 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1c78ff6512e..e7ccd3f9125 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -29,6 +29,7 @@ struct wined3d_deferred_upload { struct wined3d_resource *resource; unsigned int sub_resource_idx; + struct wined3d_bo *bo; uint8_t *sysmem, *map_ptr; struct wined3d_box box; uint32_t upload_flags; @@ -4137,7 +4138,9 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); const struct wined3d_format *format = resource->format; + struct wined3d_device *device = context->device; struct wined3d_deferred_upload *upload; + struct wined3d_bo_address addr; uint8_t *sysmem; size_t size; @@ -4174,34 +4177,54 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!deferred->upload_heap) + upload = &deferred->uploads[deferred->upload_count++]; + + if ((flags & WINED3D_MAP_DISCARD) + && device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) { - if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + upload->bo = addr.buffer_object; + upload->sysmem = NULL; + + TRACE("Allocated BO %s.\n", debug_bo_address(&addr)); + + wined3d_device_bo_map_lock(device); + upload->map_ptr = addr.buffer_object->map_ptr; + wined3d_device_bo_map_unlock(device); + upload->map_ptr += addr.buffer_object->memory_offset; + assert(upload->map_ptr); + } + else + { + if (!deferred->upload_heap) { - ERR("Failed to create upload heap.\n"); - return false; + if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(*deferred->upload_heap_refcount)))) + { + HeapDestroy(deferred->upload_heap); + deferred->upload_heap = 0; + return false; + } + + *deferred->upload_heap_refcount = 1; } - if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(*deferred->upload_heap_refcount)))) - { - HeapDestroy(deferred->upload_heap); - deferred->upload_heap = 0; + if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) return false; - } - *deferred->upload_heap_refcount = 1; + upload->bo = NULL; + upload->sysmem = sysmem; + upload->map_ptr = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); } - if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) - return false; - - upload = &deferred->uploads[deferred->upload_count++]; upload->upload_flags = UPLOAD_BO_UPLOAD_ON_UNMAP; upload->resource = resource; wined3d_resource_incref(resource); upload->sub_resource_idx = sub_resource_idx; - upload->sysmem = sysmem; - upload->map_ptr = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); upload->box = *box; map_desc->data = upload->map_ptr; @@ -4217,8 +4240,10 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { *box = upload->box; - bo->addr.buffer_object = 0; - bo->addr.addr = upload->map_ptr; + if ((bo->addr.buffer_object = upload->bo)) + bo->addr.addr = NULL; + else + bo->addr.addr = upload->map_ptr; bo->flags = upload->upload_flags; upload->upload_flags = 0; return true; @@ -4456,12 +4481,29 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; + struct wined3d_context *context; unsigned int i; TRACE("list %p.\n", list); + context = context_acquire(list->device, NULL, 0); + for (i = 0; i < list->upload_count; ++i) - HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + { + struct wined3d_bo *bo; + + if ((bo = list->uploads[i].bo)) + { + wined3d_context_destroy_bo(context, bo); + heap_free(bo); + } + else + { + HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + } + } + + context_release(context); if (list->upload_heap) {

1 0

Zebediah Figura : wined3d: Store the map pointer in the wined3d_deferred_upload structure.
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: 4e21945812c74bdf60f262bcb4d3f8267691df7a URL: https://gitlab.winehq.org/wine/wine/-/commit/4e21945812c74bdf60f262bcb4d3f8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 19:01:30 2023 -0500 wined3d: Store the map pointer in the wined3d_deferred_upload structure. --- dlls/wined3d/cs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5fc2bf64074..1c78ff6512e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -29,7 +29,7 @@ struct wined3d_deferred_upload { struct wined3d_resource *resource; unsigned int sub_resource_idx; - uint8_t *sysmem; + uint8_t *sysmem, *map_ptr; struct wined3d_box box; uint32_t upload_flags; }; @@ -4166,7 +4166,7 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context return false; upload->upload_flags = 0; - map_desc->data = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + map_desc->data = upload->map_ptr; return true; } @@ -4201,9 +4201,10 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context wined3d_resource_incref(resource); upload->sub_resource_idx = sub_resource_idx; upload->sysmem = sysmem; + upload->map_ptr = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); upload->box = *box; - map_desc->data = (void *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + map_desc->data = upload->map_ptr; return true; } @@ -4217,7 +4218,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte { *box = upload->box; bo->addr.buffer_object = 0; - bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + bo->addr.addr = upload->map_ptr; bo->flags = upload->upload_flags; upload->upload_flags = 0; return true;

1 0

Nikolay Sivov : d3d11/tests: Fix typos in a test cleanup (Coverity).
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: f7157408f2ef3c01cd16d231cef1dc7cfe2802a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7157408f2ef3c01cd16d231cef1dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 2 20:35:38 2023 +0200 d3d11/tests: Fix typos in a test cleanup (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2307c0b13c5..c87c1faad5d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -35093,9 +35093,9 @@ static void test_shared_resource(D3D_FEATURE_LEVEL feature_level) test_done: if (keyed_mutex) IDXGIKeyedMutex_Release(keyed_mutex); - if (tex) - IDXGIResource_Release(res); if (res) + IDXGIResource_Release(res); + if (tex) ID3D11Texture2D_Release(tex); if (res1) IDXGIResource1_Release(res1);

1 0

Jeff Smith : d3drm/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: 468ace0c506c2b1801670f67324713cfececec2b URL: https://gitlab.winehq.org/wine/wine/-/commit/468ace0c506c2b1801670f67324713… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:48:17 2023 -0500 d3drm/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3drm/tests/d3drm.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1dfddc25a64..2dc06d11383 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -44,6 +44,13 @@ static ULONG get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -54,10 +61,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } #define expect_matrix(m, m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44, u) \ @@ -103,13 +107,6 @@ static void vector_eq_(unsigned int line, const D3DVECTOR *left, const D3DVECTOR expect_vector_(line, left, U1(*right).x, U2(*right).y, U3(*right).z, 0); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff)

1 0

Jeff Smith : d3d8/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: f6f25c5ed15da25e9a2c36af1bcaf6d0a0bf2fa9 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6f25c5ed15da25e9a2c36af1bcaf6… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:48:05 2023 -0500 d3d8/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3d8/tests/visual.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 264a4230a75..f80ff86010e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -85,10 +85,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps)

1 0

Jeff Smith : d3d9/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: a6d828b3675cdaa51b7489cb60b0ea71d4bf95c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6d828b3675cdaa51b7489cb60b0ea… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:48:11 2023 -0500 d3d9/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3d9/tests/visual.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cb0a2549b2e..29b95419bed 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -97,10 +97,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps)

1 0

Jeff Smith : d3d11/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: c29459c9019f113b3f9bf256f8f8b7862c89aa69 URL: https://gitlab.winehq.org/wine/wine/-/commit/c29459c9019f113b3f9bf256f8f8b7… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:47:54 2023 -0500 d3d11/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3d11/tests/d3d11.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a907d907bb..2307c0b13c5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -261,6 +261,13 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO return hr; } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -271,10 +278,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned int ulps) @@ -285,13 +289,6 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) { return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w;

1 0

Jeff Smith : d3d10core/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: 162a8e1217c860f4790cdddfc19f3e6000d0c043 URL: https://gitlab.winehq.org/wine/wine/-/commit/162a8e1217c860f4790cdddfc19f3e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:47:38 2023 -0500 d3d10core/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/d3d10core/tests/d3d10core.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 31901ad333d..0c6c46ddaf4 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -182,6 +182,13 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO return hr; } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -192,10 +199,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned int ulps) @@ -206,13 +210,6 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } -static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) { return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w;

1 0

Zebediah Figura : wined3d: Release push constant buffers in wined3d_device_uninit_3d().
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: 22fcf28f05a2478df01b0a0cfae1a49376c990f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/22fcf28f05a2478df01b0a0cfae1a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 4 13:11:50 2023 -0500 wined3d: Release push constant buffers in wined3d_device_uninit_3d(). Fixes: c065b4fe0b3622e0c737a4c7c1c514273ad2d8a7 --- dlls/wined3d/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dce2b65b6d3..0b4f56000bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1407,6 +1407,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; + struct wined3d_buffer *buffer; + unsigned int i; TRACE("device %p.\n", device); @@ -1432,6 +1434,13 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } + for (i = 0; i < ARRAY_SIZE(device->push_constants); ++i) + { + if ((buffer = device->push_constants[i])) + wined3d_buffer_decref(buffer); + } + memset(device->push_constants, 0, sizeof(device->push_constants)); + wined3d_device_context_emit_reset_state(&device->cs->c, true); state_cleanup(state);

1 0

Evan Tang : wined3d: Update reported driver versions.
by Alexandre Julliard Aug. 10, 2023

Aug. 10, 2023

Module: wine Branch: master Commit: 7339135438ec598cf426009af47b7022db626f84 URL: https://gitlab.winehq.org/wine/wine/-/commit/7339135438ec598cf426009af47b70… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Aug 4 12:03:08 2023 -0500 wined3d: Update reported driver versions. --- dlls/wined3d/directx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb0e5e9bad0..80b06712161 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -238,6 +238,9 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) * 24 -> Windows 10 April 2018 Update - WDDM 2.4 * 25 -> Windows 10 October 2018 Update - WDDM 2.5 * 26 -> Windows 10 May 2019 Update - WDDM 2.6 + * 27 -> Windows 10 May 2020 Update - WDDM 2.7 + * 30 -> Windows 11 21H2 - WDDM 3.0 + * 31 -> Windows 11 22H2 - WDDM 3.1 * * "y" is the maximum Direct3D version / feature level the driver supports. * 11 -> 6 @@ -285,7 +288,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 15002, 61}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 21023, 2010}, /* Adrenalin 23.7.2 */ /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -297,7 +300,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 10, 5218}, {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 10, 1504}, {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 10, 1666}, - {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 15, 4352}, + {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 101, 4577}, /* Nvidia * - Geforce8 and newer is supported by the current 340.52 driver on XP-Win8 @@ -314,7 +317,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 13, 783}, {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT6X, "nvd3dum.dll", 13, 4052}, {DRIVER_NVIDIA_FERMI, DRIVER_MODEL_NT6X, "nvd3dum.dll", 13, 9135}, - {DRIVER_NVIDIA_KEPLER, DRIVER_MODEL_NT6X, "nvd3dum.dll", 14, 4587}, + {DRIVER_NVIDIA_KEPLER, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 3118}, /* 531.18 */ /* Red Hat */ {DRIVER_REDHAT_VIRGL, DRIVER_MODEL_GENERIC, "virgl.dll", 0, 0}, @@ -773,7 +776,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, break; case 10: - driver_os_version = 26; + driver_os_version = 31; driver_model = DRIVER_MODEL_NT6X; break; @@ -829,6 +832,10 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, else if (os_version.dwMajorVersion < 6) driver_feature_level = min(driver_feature_level, 14); + /* Drivers with the OS version 30+ all have the feature level word set to 0 */ + if (driver_os_version >= 30) + driver_feature_level = 0; + driver_info->vendor = gpu_desc->vendor; driver_info->device = gpu_desc->device; wined3d_copy_name(driver_info->description, gpu_desc->description, ARRAY_SIZE(driver_info->description));

1 0