February 2020 - Wine-devel - list.winehq.org

[PATCH] quartz: Remove unused functions.
by Jacek Caban 07 Feb '20

07 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/quartz/dsoundrender.c | 5 ----- dlls/quartz/videorenderer.c | 5 ----- 2 files changed, 10 deletions(-)

1 0

[PATCH v3 1/5] vbscript: Fail if we have no context in InvokeEx.
by Gabriel Ivăncescu 07 Feb '20

07 Feb '20

The current code can't cope with it, so do the same thing as in GetDispID, to prevent a possible crash. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Create fresh script dispatches for persistent code contexts, to avoid corner cases with externally held dispatches. dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b..36eba21 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1388,6 +1388,9 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if (!This->ctx) + return E_UNEXPECTED; + if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; -- 2.21.0

2 11

[PATCH 2/4] d3d9/tests: Add multiple adapters tests.
by Henri Verbeet 07 Feb '20

07 Feb '20

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 178051. dlls/d3d9/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 03ebe242e97..156cb188f05 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13405,6 +13405,48 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + unsigned int i, adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D9 *d3d; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D9_GetAdapterMonitor(d3d, i); + ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + + if (!i) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, + "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + else + ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + } + + IDirect3D9_Release(d3d); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -13532,6 +13574,7 @@ START_TEST(device) test_multiply_transform(); test_vertex_buffer_read_write(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.11.0

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 07 Feb '20

07 Feb '20

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 58 ++++++++++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/po/fi.po b/po/fi.po index ed89ee2509..ac15875867 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3703,17 +3703,15 @@ msgstr "Odotettiin merkkiä '@'" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript -käännösvirhe" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript -suoritusvirhe" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Tuntematon virhe" +msgstr "Tuntematon ajonaikainen virhe" #: jscript.rc:54 msgid "Number expected" @@ -3761,7 +3759,7 @@ msgstr "Syntaksivirhe säännöllisessä lausekkeessa" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Poikkeusta ei otettu kiinni" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -8310,79 +8308,59 @@ msgstr "Tarjoaja" #: version.rc:45 msgid "Select the data you want to connect to:" -msgstr "Valitse data, johon haluat yhdistää:" +msgstr "Valitse tietolähde, johon haluat yhdistää:" #: version.rc:52 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Yhteydet" +msgstr "Yhteys" #: version.rc:55 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Valitse data, johon haluat yhdistää:" +msgstr "Määritä seuraavat, jotta voit yhdistää ODBC-tietolähteeseen:" #: version.rc:56 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Määritä tietolähde:" #: version.rc:57 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Anna nimesi" +msgstr "Käytä tietolähteen &nimeä" #: version.rc:60 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Nollattuja yhteyksiä" +msgstr "Syötä yhteysasetukset &merkkijonona" #: version.rc:61 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Yhteydet" +msgstr "Yhteys&asetukset:" #: version.rc:63 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "&Lisää..." +msgstr "&Luo..." #: version.rc:64 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Syötä palvelimen kirjautumistiedot" #: version.rc:65 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "&Käyttäjänimi:" +msgstr "&Tunnus:" #: version.rc:69 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tyhjä sivu" +msgstr "&Ei salasanaa" #: version.rc:70 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Väärä salasana.\n" +msgstr "Sa&lli salasanan tallennus" #: version.rc:71 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Syötä ensiksi käytettävä &katalogi:" #: version.rc:73 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Nollattuja yhteyksiä" +msgstr "Testaa y&hteyttä" #: version.rc:36 msgid "Data Link Properties" -- 2.25.0

1 0

[PATCH 1/6] d3d9: Reset the viewport and scissor rect for extended devices in d3d9_device_reset().
by Zebediah Figura 07 Feb '20

07 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 22 ++++++++++++++++++++-- dlls/wined3d/device.c | 16 ---------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index da884544ea..4dfc88a1a8 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1039,6 +1039,24 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; device->device_state = D3D9_DEVICE_STATE_OK; + + if (extended) + { + const struct wined3d_viewport *current = &wined3d_stateblock_get_state(device->state)->viewport; + struct wined3d_viewport vp; + RECT rect; + + vp.x = 0; + vp.y = 0; + vp.width = swapchain_desc.backbuffer_width; + vp.height = swapchain_desc.backbuffer_height; + vp.min_z = current->min_z; + vp.max_z = current->max_z; + wined3d_stateblock_set_viewport(device->state, &vp); + + SetRect(&rect, 0, 0, swapchain_desc.backbuffer_width, swapchain_desc.backbuffer_height); + wined3d_stateblock_set_scissor_rect(device->state, &rect); + } } rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); @@ -2158,7 +2176,7 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; @@ -2737,7 +2755,7 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rect); + *rect = wined3d_stateblock_get_state(device->state)->scissor_rect; wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fc4933bd72..8405643741 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5576,24 +5576,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device_load_logo(device, wined3d_settings.logo); } else if ((view = device->back_buffer_view)) - { - struct wined3d_state *state = &device->state; - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); - /* Note the min_z / max_z is not reset. */ - state->viewports[0].x = 0; - state->viewports[0].y = 0; - state->viewports[0].width = view->width; - state->viewports[0].height = view->height; - state->viewport_count = 1; - wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - - SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); - state->scissor_rect_count = 1; - wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); - } - if (device->d3d_initialized && reset_state) hr = device->adapter->adapter_ops->adapter_init_3d(device); -- 2.25.0

3 12

[PATCH 4/4] wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity).
by Henri Verbeet 07 Feb '20

07 Feb '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/stateblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f6d36f8c259..499d23fbbd3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1459,10 +1459,10 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock return; } - if (stage > WINED3D_MAX_TEXTURES) + if (stage >= WINED3D_MAX_TEXTURES) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", - stage, WINED3D_MAX_TEXTURES); + stage, WINED3D_MAX_TEXTURES - 1); return; } -- 2.11.0

1 0

[PATCH 3/4] dxgi/tests: Add multiple adapters tests.
by Henri Verbeet 07 Feb '20

07 Feb '20

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 178052. dlls/dxgi/tests/dxgi.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index aaef8113640..f8e63ea25e8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4899,6 +4899,128 @@ static void flush_events(void) } } +struct adapter_info +{ + const WCHAR *name; + HMONITOR monitor; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC dc, RECT *rect, LPARAM lparam) +{ + struct adapter_info *adapter_info = (struct adapter_info *)lparam; + MONITORINFOEXW monitor_info; + + monitor_info.cbSize = sizeof(monitor_info); + if (GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info) + && !lstrcmpiW(adapter_info->name, monitor_info.szDevice)) + { + adapter_info->monitor = monitor; + return FALSE; + } + + return TRUE; +} + +static HMONITOR get_monitor(const WCHAR *adapter_name) +{ + struct adapter_info info = {adapter_name, NULL}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + return info.monitor; +} + +static void test_multi_adapter(void) +{ + unsigned int output_count = 0, expected_output_count = 0; + unsigned int adapter_index, output_index, device_index; + DISPLAY_DEVICEW display_device; + DXGI_OUTPUT_DESC output_desc; + MONITORINFO monitor_info; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + HMONITOR monitor; + BOOL found; + HRESULT hr; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) + { + skip("Failed to create IDXGIFactory, hr %#x.\n", hr); + return; + } + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Could not enumerate adapters.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + + for (adapter_index = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)); ++adapter_index) + { + for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index) + { + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + found = FALSE; + display_device.cb = sizeof(display_device); + for (device_index = 0; EnumDisplayDevicesW(NULL, device_index, &display_device, 0); ++device_index) + { + if (!lstrcmpiW(display_device.DeviceName, output_desc.DeviceName)) + { + found = TRUE; + break; + } + } + ok(found, "Failed to find device %s for adapter %u, output %u.\n", + wine_dbgstr_w(output_desc.DeviceName), adapter_index, output_index); + + ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + if (!adapter_index && !output_index) + ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + else + ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + + /* Should have the same monitor handle. */ + monitor = get_monitor(display_device.DeviceName); + ok(!!monitor, "Failed to find monitor %s.\n", wine_dbgstr_w(display_device.DeviceName)); + ok(monitor == output_desc.Monitor, "Got unexpected monitor %p, expected %p.\n", + monitor, output_desc.Monitor); + + /* Should have the same monitor rectangle. */ + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, output %u, error %#x.\n", + adapter_index, output_index, GetLastError()); + ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), + "Got unexpected output rect %s, expected %s for adapter %u, output %u.\n", + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&output_desc.DesktopCoordinates), + adapter_index, output_index); + + IDXGIOutput_Release(output); + ++output_count; + } + + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory_Release(factory); + + expected_output_count = GetSystemMetrics(SM_CMONITORS); + todo_wine_if(expected_output_count > 1) + ok(output_count == expected_output_count, "Expect output count %d, got %d\n", + expected_output_count, output_count); +} + struct message { unsigned int message; @@ -5824,6 +5946,7 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); + queue_test(test_multi_adapter); run_queued_tests(); -- 2.11.0

1 0

[PATCH 1/4] d3d8/tests: Add multiple adapters tests.
by Henri Verbeet 07 Feb '20

07 Feb '20

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 178050. dlls/d3d8/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 80bf62e3612..19351da0912 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9760,6 +9760,48 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + unsigned int i, adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D8 *d3d; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D8_GetAdapterMonitor(d3d, i); + ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + + if (!i) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, + "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + else + ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + } + + IDirect3D8_Release(d3d); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9876,6 +9918,7 @@ START_TEST(device) test_multiply_transform(); test_draw_primitive(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.11.0

1 0

[PATCH] wined3d: Add GPU information for NVIDIA GeForce GTX 1060 3GB.
by Brendan Shanks 07 Feb '20

07 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7e6f8a2817..19c1cfbb42 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1364,6 +1364,7 @@ cards_nvidia_binary[] = {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ + {"GTX 1060 3GB", CARD_NVIDIA_GEFORCE_GTX1060_3GB},/* GeForce 1000 - midend high */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 12b53f7577..7018d22a1b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -414,6 +414,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060_3GB,"NVIDIA GeForce GTX 1060 3GB", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5beaa927d7..7516f1df70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2579,6 +2579,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, + CARD_NVIDIA_GEFORCE_GTX1060_3GB = 0x1c02, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, -- 2.24.1

2 1

[PATCH] wined3d: Implement casting int to uint.
by Zebediah Figura 07 Feb '20

07 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This supersedes <https://source.winehq.org/patches/data/177793>. dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 25e97723255..4a2fbce553e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3125,7 +3125,7 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param } static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, - enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) + enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type, unsigned int size) { if (dst_data_type == src_data_type) { @@ -3156,10 +3156,22 @@ static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, co return; } - if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) + if (src_data_type == WINED3D_DATA_INT) { - string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); - return; + switch (dst_data_type) + { + case WINED3D_DATA_FLOAT: + string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); + return; + case WINED3D_DATA_UINT: + if (size == 1) + string_buffer_sprintf(dst_param, "uint(%s)", src_param); + else + string_buffer_sprintf(dst_param, "uvec%u(%s)", size, src_param); + return; + default: + break; + } } FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); @@ -3179,6 +3191,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + unsigned int size; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; @@ -3190,24 +3203,30 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c { case WINED3DSPR_IMMCONST: param_data_type = data_type; + size = wined3d_src->reg.immconst_type == WINED3D_IMMCONST_SCALAR ? 1 : 4; break; case WINED3DSPR_FORKINSTID: case WINED3DSPR_GSINSTID: case WINED3DSPR_JOININSTID: - case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_LOCALTHREADINDEX: case WINED3DSPR_OUTPOINTID: case WINED3DSPR_PRIMID: + param_data_type = WINED3D_DATA_INT; + size = 1; + break; + case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_THREADGROUPID: case WINED3DSPR_THREADID: param_data_type = WINED3D_DATA_INT; + size = 3; break; default: param_data_type = WINED3D_DATA_FLOAT; + size = 4; break; } - shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type); + shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type, size); shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); string_buffer_release(priv->string_buffers, reg_name); @@ -7520,7 +7539,7 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff dst_data_type = component_type_info[output->component_type].data_type; shader_addline(buffer, "color_out%u = ", output->semantic_idx); string_buffer_sprintf(src, "ps_out[%u]", output->semantic_idx); - shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT); + shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT, 4); swizzle = args->rt_alpha_swizzle & (1u << output->semantic_idx) ? ".argb" : ""; shader_addline(buffer, "%s%s;\n", assignment->buffer, swizzle); } -- 2.25.0

2 1