winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1165 discussions
Start a n
N
ew thread
Rémi Bernon : dinput: Only dump the HID report data that has been read.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: cb8bc378c2d67989071e34790dde9d7f921ece00 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cb8bc378c2d67989071e3479…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 09:56:22 2021 +0200 dinput: Only dump the HID report data that has been read. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 48594e5d622..203a5d7788d 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1607,14 +1607,14 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (ret && TRACE_ON(dinput)) { TRACE( "read size %u report:\n", count ); - for (i = 0; i < report_len;) + for (i = 0; i < count;) { char buffer[256], *buf = buffer; buf += sprintf(buf, "%08x ", i); do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < report_len); + } while (++i % 16 && i < count); TRACE("%s\n", buffer); } }
1
0
0
0
Rémi Bernon : maintainers: Assume maintainership of the Joystick input section.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: 33578878e6988879790a41f2eccbc37f0d70e0c4 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=33578878e6988879790a41f2…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:32 2021 +0200 maintainers: Assume maintainership of the Joystick input section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e11186011fc..ea27dc41af3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,8 +181,8 @@ M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/jscript/ Joystick input +M: Rémi Bernon <rbernon(a)codeweavers.com> P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/dinput*/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/
1
0
0
0
Rémi Bernon : maintainers: Replace DirectInput with a Joystick input section.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: 5dd12ecd38477307954af82d4d3faaf65c7cde59 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5dd12ecd38477307954af82d…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:31 2021 +0200 maintainers: Replace DirectInput with a Joystick input section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c44fe86c45f..e11186011fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -87,11 +87,6 @@ F: dlls/d3dx11*/ F: dlls/d3dx9*/ F: dlls/d3dxof/ -DirectInput -P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Rémi Bernon <rbernon(a)codeweavers.com> -F: dlls/dinput/ - DirectMusic M: Michael Stefaniuc <mstefani(a)winehq.org> F: dlls/dm*/ @@ -185,6 +180,15 @@ JavaScript M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/jscript/ +Joystick input +P: Andrew Eikum <aeikum(a)codeweavers.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> +F: dlls/dinput*/ +F: dlls/windows.gaming.input/ +F: dlls/winebus.sys/ +F: dlls/winexinput.sys/ +F: dlls/xinput*/ + Mac OS X graphics driver M: Ken Thomases <ken(a)codeweavers.com> F: dlls/winemac.drv/
1
0
0
0
Rémi Bernon : maintainers: Add hidparse.sys under HID support.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: 902aadb722a2acb537be96ee95964f0a9eea2ccd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=902aadb722a2acb537be96ee…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:30 2021 +0200 maintainers: Add hidparse.sys under HID support. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5bf636cfd34..c44fe86c45f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,6 +163,7 @@ M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ +F: dlls/hidparse.sys/ F: dlls/winehid.sys/ HTTP server
1
0
0
0
Alexandre Julliard : kernelbase: Remove dead code.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: e8beac105c9119fa109862e88c795cee1e8d27ab URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e8beac105c9119fa109862e8…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 18:29:10 2021 +0200 kernelbase: Remove dead code. __APPLE__ is never defined in the PE build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 89b35775053..1c2f4dda221 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5579,9 +5579,6 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co if (unix_cp == CP_UTF8) { ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); -#ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ - if (ret && dstlen) RtlNormalizeString( NormalizationC, dst, ret, dst, &ret ); -#endif break; } codepage = unix_cp;
1
0
0
0
Alexandre Julliard : winemenubuilder: Remove dead code.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: ca034201429201452d95d6a2e2cadbef93a20c42 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ca034201429201452d95d6a2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 17:36:18 2021 +0200 winemenubuilder: Remove dead code. __APPLE__ is never defined in the PE build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 143 ----------------------------- 1 file changed, 143 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 51d83aed971..5b6fe071916 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -181,8 +181,6 @@ struct rb_string_entry struct wine_rb_entry entry; }; -DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); - static WCHAR *xdg_menu_dir; static WCHAR *xdg_data_dir; static WCHAR xdg_desktop_dir[MAX_PATH]; @@ -355,7 +353,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder = NULL; IWICBitmapEncoder *encoder = NULL; - IWICBitmapScaler *scaler = NULL; IStream *outputFile = NULL; int i; HRESULT hr = E_FAIL; @@ -374,14 +371,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); goto end; } - if (IsEqualCLSID(outputFormat,&CLSID_WICIcnsEncoder)) - { - hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); - if (FAILED(hr)) - { - WINE_WARN("error 0x%08X creating IWICBitmapScaler\n", hr); - } - } hr = CoCreateInstance(outputFormat, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); if (FAILED(hr)) @@ -422,22 +411,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X converting bitmap to 32bppBGRA\n", hr); goto endloop; } - if ( scaler) - { - IWICBitmapSource_GetSize(sourceBitmap, &width, &height); - if (width == 64) /* Classic Mode */ - { - hr = IWICBitmapScaler_Initialize( scaler, sourceBitmap, 128, 128, - WICBitmapInterpolationModeNearestNeighbor); - if (FAILED(hr)) - WINE_ERR("error 0x%08X scaling bitmap\n", hr); - else - { - IWICBitmapSource_Release(sourceBitmap); - IWICBitmapScaler_QueryInterface(scaler, &IID_IWICBitmapSource, (LPVOID)&sourceBitmap); - } - } - } hr = IWICBitmapEncoder_CreateNewFrame(encoder, &dstFrame, &options); if (FAILED(hr)) { @@ -503,8 +476,6 @@ end: IWICImagingFactory_Release(factory); if (decoder) IWICBitmapDecoder_Release(decoder); - if (scaler) - IWICBitmapScaler_Release(scaler); if (encoder) IWICBitmapEncoder_Release(encoder); if (outputFile) @@ -1081,119 +1052,6 @@ static WCHAR *compute_native_identifier(int exeIndex, LPCWSTR icoPathW, LPCWSTR return heap_wprintf(L"%04X_%.*s.%d", crc, (int)(ext - basename), basename, exeIndex); } -#ifdef __APPLE__ -#define ICNS_SLOTS 6 - -static inline int size_to_slot(int size) -{ - switch (size) - { - case 16: return 0; - case 32: return 1; - case 48: return 2; - case 64: return -2; /* Classic Mode */ - case 128: return 3; - case 256: return 4; - case 512: return 5; - } - - return -1; -} - -#define CLASSIC_SLOT 3 - -static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, - int numEntries, int exeIndex, LPCWSTR icoPathW, - const WCHAR *destFilename, WCHAR **nativeIdentifier) -{ - struct { - int index; - int maxBits; - BOOL scaled; - } best[ICNS_SLOTS]; - int indexes[ICNS_SLOTS]; - int i; - WCHAR tmpdir[MAX_PATH]; - WCHAR *icnsPath; - LARGE_INTEGER zero; - HRESULT hr; - - for (i = 0; i < ICNS_SLOTS; i++) - { - best[i].index = -1; - best[i].maxBits = 0; - } - for (i = 0; i < numEntries; i++) - { - int slot; - int width = iconDirEntries[i].bWidth ? iconDirEntries[i].bWidth : 256; - int height = iconDirEntries[i].bHeight ? iconDirEntries[i].bHeight : 256; - BOOL scaled = FALSE; - - WINE_TRACE("[%d]: %d x %d @ %d\n", i, width, height, iconDirEntries[i].wBitCount); - if (height != width) - continue; - slot = size_to_slot(width); - if (slot == -2) - { - scaled = TRUE; - slot = CLASSIC_SLOT; - } - else if (slot < 0) - continue; - if (scaled && best[slot].maxBits && !best[slot].scaled) - continue; /* don't replace unscaled with scaled */ - if (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled)) - { - best[slot].index = i; - best[slot].maxBits = iconDirEntries[i].wBitCount; - best[slot].scaled = scaled; - } - } - /* remove the scaled icon if a larger unscaled icon exists */ - if (best[CLASSIC_SLOT].scaled) - { - for (i = CLASSIC_SLOT+1; i < ICNS_SLOTS; i++) - if (best[i].index >= 0 && !best[i].scaled) - { - best[CLASSIC_SLOT].index = -1; - break; - } - } - - numEntries = 0; - for (i = 0; i < ICNS_SLOTS; i++) - { - if (best[i].index >= 0) - { - indexes[numEntries] = best[i].index; - numEntries++; - } - } - - *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW, destFilename); - GetTempPathW( MAX_PATH, tmpdir ); - icnsPath = heap_wprintf(L"%s\\%s.icns", tmpdir, *nativeIdentifier); - zero.QuadPart = 0; - hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - { - WINE_WARN("seeking icon stream failed, error 0x%08X\n", hr); - goto end; - } - hr = convert_to_native_icon(icoStream, indexes, numEntries, &CLSID_WICIcnsEncoder, icnsPath); - if (FAILED(hr)) - { - WINE_WARN("converting %s to %s failed, error 0x%08X\n", - wine_dbgstr_w(icoPathW), wine_dbgstr_w(icnsPath), hr); - goto end; - } - -end: - heap_free(icnsPath); - return hr; -} -#else static void refresh_icon_cache(const WCHAR *iconsDir) { WCHAR buffer[MAX_PATH]; @@ -1270,7 +1128,6 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr heap_free(iconsDir); return hr; } -#endif /* defined(__APPLE__) */ /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ static WCHAR *extract_icon(LPCWSTR icoPathW, int index, const WCHAR *destFilename, BOOL bWait)
1
0
0
0
Alexandre Julliard : explorer: Use the correct buffer size for the full path name.
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: wine Branch: master Commit: 130ec9dbf9e1ff70f6a6817dc325d24b7a3b568b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=130ec9dbf9e1ff70f6a6817d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 12:53:11 2021 +0200 explorer: Use the correct buffer size for the full path name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 43bd4ef13a8..cb0d63fb688 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -404,7 +404,7 @@ static void make_explorer_window(parameters_struct *params) if (params->root[0]) { size = GetFullPathNameW(params->root, 0, NULL, NULL); - path = malloc(size); + path = malloc( size * sizeof(WCHAR) ); GetFullPathNameW(params->root, size, path, NULL); }
1
0
0
0
Conor McCarthy : tests: Add a UINT_MAX layer count test to test_clear_depth_stencil_view().
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: vkd3d Branch: master Commit: 41685c374a4883696c98c72cd9b3090c29c1334e URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=41685c374a4883696c98c72…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:16 2021 +0200 tests: Add a UINT_MAX layer count test to test_clear_depth_stencil_view(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e4dcb5..5593393 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4485,6 +4485,17 @@ static void test_clear_depth_stencil_view(void) reset_command_list(command_list, context.allocator); } + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + dsv_desc.Texture2DArray.ArraySize = UINT_MAX; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 5, queue, command_list, expected_values[4], 1); + destroy_depth_stencil(&ds); destroy_test_context(&context); }
1
0
0
0
Conor McCarthy : tests: Add UINT_MAX layer count tests to test_clear_render_target_view().
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: vkd3d Branch: master Commit: dbb07a40f8524881fbc0f81c5c1842c54401b2f4 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=dbb07a40f8524881fbc0f81…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:15 2021 +0200 tests: Add UINT_MAX layer count tests to test_clear_render_target_view(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac1e24d..9e4dcb5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4672,7 +4672,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; rtv_desc.Texture2DArray.FirstArraySlice = i; - rtv_desc.Texture2DArray.ArraySize = 1; + rtv_desc.Texture2DArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4703,7 +4703,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; rtv_desc.Texture2DMSArray.FirstArraySlice = i; - rtv_desc.Texture2DMSArray.ArraySize = 1; + rtv_desc.Texture2DMSArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4759,6 +4759,23 @@ static void test_clear_render_target_view(void) check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); release_resource_readback(&rb); + rtv_desc.Texture3D.FirstWSlice = 30; + rtv_desc.Texture3D.WSize = UINT_MAX; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 4, 32, 32, 30); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 30, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context);
1
0
0
0
Conor McCarthy : tests: Test a UINT_MAX layer count in test_clear_unordered_access_view_image().
by Alexandre Julliard
12 Oct '21
12 Oct '21
Module: vkd3d Branch: master Commit: e3495613fbb52b343dd1263a86880c4a5298c879 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3495613fbb52b343dd1263…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:14 2021 +0200 tests: Test a UINT_MAX layer count in test_clear_unordered_access_view_image(). Testing without the fixes in vkd3d_create_texture_uav() has nasty results in radv and possibly others. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d1337e2..ac1e24d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5014,6 +5014,8 @@ static void test_clear_unordered_access_view_image(void) {0x3f000000, 0, 0, 0}, 0x3f000000, true}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, + /* Test clearing a UINT_MAX layer count. */ + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, UINT_MAX, 0, {}, {1, 0, 0, 0}, 1}, /* Test a single clear rect. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, {1, 0, 0, 0}, 1},
1
0
0
0
← Newer
1
...
71
72
73
74
75
76
77
...
117
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
Results per page:
10
25
50
100
200