- Wine-Commits - list.winehq.org

Rémi Bernon : mfplat: Use IMFMediaType_GetBlobSize instead of IMFMediaType_GetBlob.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 3404de3075c2cc2484e1bb37e43c24d7baed0ed1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3404de3075c2cc2484e1bb37e43c24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 7 15:24:00 2024 +0200 mfplat: Use IMFMediaType_GetBlobSize instead of IMFMediaType_GetBlob. --- dlls/mfplat/mediatype.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 9f199bd59a6..904a5391bf4 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -4208,8 +4208,7 @@ HRESULT WINAPI MFInitAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID f if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_SAMPLE_SIZE, &value))) am_type->lSampleSize = value; - if (FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, NULL, 0, &user_size)) - && hr != E_NOT_SUFFICIENT_BUFFER) + if (FAILED(IMFMediaType_GetBlobSize(media_type, &MF_MT_USER_DATA, &user_size))) user_size = 0; if (IsEqualGUID(&am_type->majortype, &MFMediaType_Audio))

1 0

Rémi Bernon : mfplat: Introduce a new init_video_info_header helper.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 704c510045b47c975fc6918dcb66640f86932d91 URL: https://gitlab.winehq.org/wine/wine/-/commit/704c510045b47c975fc6918dcb6664… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 7 15:28:45 2024 +0200 mfplat: Introduce a new init_video_info_header helper. --- dlls/mfplat/mediatype.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 904a5391bf4..514f6e5b1dc 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -4118,6 +4118,20 @@ static void init_video_info_header2(VIDEOINFOHEADER2 *vih, const GUID *subtype, } } +static void init_video_info_header(VIDEOINFOHEADER *vih, const GUID *subtype, IMFMediaType *media_type) +{ + VIDEOINFOHEADER2 vih2 = {{0}}; + + init_video_info_header2(&vih2, subtype, media_type); + + vih->rcSource = vih2.rcSource; + vih->rcTarget = vih2.rcTarget; + vih->dwBitRate = vih2.dwBitRate; + vih->dwBitErrorRate = vih2.dwBitErrorRate; + vih->AvgTimePerFrame = vih2.AvgTimePerFrame; + vih->bmiHeader = vih2.bmiHeader; +} + static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 user_size, IMFMediaType *media_type) { HRESULT hr; @@ -4132,7 +4146,6 @@ static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 us if (IsEqualGUID(&am_type->formattype, &FORMAT_VideoInfo) || IsEqualGUID(&am_type->formattype, &GUID_NULL)) { - VIDEOINFOHEADER2 vih = {{0}}; VIDEOINFOHEADER *format; am_type->cbFormat = sizeof(*format) + user_size; @@ -4141,13 +4154,7 @@ static HRESULT init_am_media_type_video_format(AM_MEDIA_TYPE *am_type, UINT32 us format = (VIDEOINFOHEADER *)am_type->pbFormat; memset(format, 0, sizeof(*format)); - init_video_info_header2(&vih, &am_type->subtype, media_type); - format->rcSource = vih.rcSource; - format->rcTarget = vih.rcTarget; - format->dwBitRate = vih.dwBitRate; - format->dwBitErrorRate = vih.dwBitErrorRate; - format->AvgTimePerFrame = vih.AvgTimePerFrame; - format->bmiHeader = vih.bmiHeader; + init_video_info_header(format, &am_type->subtype, media_type); if (user_size && FAILED(hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)(format + 1), user_size, NULL)))

1 0

Rémi Bernon : mfplat: Fix MFCreateMFVideoFormatFromMFMediaType videoInfo.VideoFlags masks.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 551d047ae4288dca14f78508385b3b4779c16dee URL: https://gitlab.winehq.org/wine/wine/-/commit/551d047ae4288dca14f78508385b3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 7 13:57:34 2024 +0200 mfplat: Fix MFCreateMFVideoFormatFromMFMediaType videoInfo.VideoFlags masks. --- dlls/mfplat/mediatype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 370db8059f3..9f199bd59a6 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3317,9 +3317,9 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF sizeof(format->videoInfo.MinimumDisplayAperture), NULL); /* Video flags. */ - format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_PAD_CONTROL_FLAGS); - format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_SOURCE_CONTENT_HINT); - format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_DRM_FLAGS); + format->videoInfo.VideoFlags |= media_type_get_uint32(media_type, &MF_MT_PAD_CONTROL_FLAGS) & MFVideoFlag_PAD_TO_Mask; + format->videoInfo.VideoFlags |= (media_type_get_uint32(media_type, &MF_MT_SOURCE_CONTENT_HINT) << 2) & MFVideoFlag_SrcContentHintMask; + format->videoInfo.VideoFlags |= (media_type_get_uint32(media_type, &MF_MT_DRM_FLAGS) << 5) & (MFVideoFlag_AnalogProtected | MFVideoFlag_DigitallyProtected); if (media_type_get_uint32(media_type, &MF_MT_PAN_SCAN_ENABLED)) { format->videoInfo.VideoFlags |= MFVideoFlag_PanScanEnabled;

1 0

Paul Gofman : win32u: Update last message time in NtUserGetRawInputBuffer().
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 0884b503c9d5956cd828b9e81d09e3b9f396f283 URL: https://gitlab.winehq.org/wine/wine/-/commit/0884b503c9d5956cd828b9e81d09e3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 7 15:11:27 2024 -0600 win32u: Update last message time in NtUserGetRawInputBuffer(). --- dlls/user32/tests/input.c | 70 ++++++++++++++++++++++++++++++++++++++++-- dlls/win32u/rawinput.c | 3 ++ include/wine/server_protocol.h | 4 ++- server/protocol.def | 1 + server/queue.c | 1 + server/request.h | 5 +-- server/trace.c | 1 + 7 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index fcaa4229b02..81af2aa5f28 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2091,7 +2091,12 @@ static void test_GetRawInputBuffer(void) char buffer[16 * sizeof(RAWINPUT64)]; RAWINPUT64 *rawbuffer64 = (RAWINPUT64 *)buffer; RAWINPUT *rawbuffer = (RAWINPUT *)buffer; + DWORD t1, t2, t3, now, pos1, pos2; + LPARAM extra_info1, extra_info2; + INPUT_MESSAGE_SOURCE source; + POINT pt; HWND hwnd; + BOOL ret; if (is_wow64) rawinput_size = sizeof(RAWINPUTHEADER64) + sizeof(RAWMOUSE); else rawinput_size = sizeof(RAWINPUTHEADER) + sizeof(RAWMOUSE); @@ -2099,6 +2104,14 @@ static void test_GetRawInputBuffer(void) hwnd = create_foreground_window( TRUE ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)rawinputbuffer_wndproc ); + if (pGetCurrentInputMessageSource) + { + ret = pGetCurrentInputMessageSource( &source ); + ok( ret, "got error %lu.\n", GetLastError() ); + ok( !source.deviceType, "got %#x.\n", source.deviceType ); + ok( !source.originId, "got %#x.\n", source.originId ); + } + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; raw_devices[0].usUsage = HID_USAGE_GENERIC_MOUSE; raw_devices[0].dwFlags = RIDEV_INPUTSINK; @@ -2116,6 +2129,11 @@ static void test_GetRawInputBuffer(void) ok_ret( ERROR_INVALID_PARAMETER, GetLastError() ); /* valid calls, but no input */ + t1 = GetMessageTime(); + pos1 = GetMessagePos(); + extra_info1 = GetMessageExtraInfo(); + now = GetTickCount(); + ok( t1 <= now, "got %lu, %lu.\n", t1, now ); size = sizeof(buffer); ok_ret( 0, GetRawInputBuffer( NULL, &size, sizeof(RAWINPUTHEADER) ) ); @@ -2128,8 +2146,10 @@ static void test_GetRawInputBuffer(void) ok_eq( 0, size, UINT, "%u" ); - mouse_event( MOUSEEVENTF_MOVE, 5, 0, 0, 0 ); - + Sleep( 20 ); + mouse_event( MOUSEEVENTF_MOVE, 5, 0, 0, 0xdeadbeef ); + t2 = GetMessageTime(); + ok( t2 == t1, "got %lu, %lu.\n", t1, t2 ); /* invalid calls with input */ SetLastError( 0xdeadbeef ); @@ -2137,6 +2157,9 @@ static void test_GetRawInputBuffer(void) ok_ret( (UINT)-1, GetRawInputBuffer( rawbuffer, &size, sizeof(RAWINPUTHEADER) ) ); ok_eq( rawinput_size, size, UINT, "%u" ); ok_ret( ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + t2 = GetMessageTime(); + ok( t2 == t1, "got %lu, %lu.\n", t1, t2 ); + SetLastError( 0xdeadbeef ); size = sizeof(buffer); ok_ret( (UINT)-1, GetRawInputBuffer( rawbuffer, &size, 0 ) ); @@ -2158,6 +2181,8 @@ static void test_GetRawInputBuffer(void) /* NOTE: calling with size == rawinput_size returns an error, */ /* BUT it fills the buffer nonetheless and empties the internal buffer (!!) */ + Sleep( 20 ); + t2 = GetTickCount(); size = 0; ok_ret( 0, GetRawInputBuffer( NULL, &size, sizeof(RAWINPUTHEADER) ) ); ok_eq( rawinput_size, size, UINT, "%u" ); @@ -2170,6 +2195,23 @@ static void test_GetRawInputBuffer(void) if (is_wow64) ok_eq( 5, rawbuffer64->data.mouse.lLastX, UINT, "%u" ); else ok_eq( 5, rawbuffer->data.mouse.lLastX, UINT, "%u" ); + t3 = GetMessageTime(); + pos2 = GetMessagePos(); + extra_info2 = GetMessageExtraInfo(); + ok( extra_info2 == extra_info1, "got %#Ix, %#Ix.\n", extra_info1, extra_info2 ); + GetCursorPos( &pt ); + ok( t3 > t1, "got %lu, %lu.\n", t1, t3 ); + ok( t3 < t2, "got %lu, %lu.\n", t2, t3 ); + ok( pos1 == pos2, "got pos1 (%ld, %ld), pos2 (%ld, %ld), pt (%ld %ld).\n", + pos1 & 0xffff, pos1 >> 16, pos2 & 0xffff, pos2 >> 16, pt.x, pt.y ); + if (pGetCurrentInputMessageSource) + { + ret = pGetCurrentInputMessageSource( &source ); + ok( ret, "got error %lu.\n", GetLastError() ); + ok( !source.deviceType, "got %#x.\n", source.deviceType ); + ok( !source.originId, "got %#x.\n", source.originId ); + } + /* no more data to read */ size = sizeof(buffer); @@ -2178,8 +2220,20 @@ static void test_GetRawInputBuffer(void) /* rawinput_size + 1 succeeds */ + t1 = GetMessageTime(); + pos1 = GetMessagePos(); + extra_info1 = GetMessageExtraInfo(); + now = GetTickCount(); + ok( t1 <= now, "got %lu, %lu.\n", t1, now ); + + Sleep( 20 ); + mouse_event( MOUSEEVENTF_MOVE, 5, 0, 0, 0xfeedcafe ); - mouse_event( MOUSEEVENTF_MOVE, 5, 0, 0, 0 ); + t2 = GetMessageTime(); + ok( t2 == t1, "got %lu, %lu.\n", t1, t2 ); + + Sleep( 20 ); + t2 = GetTickCount(); size = rawinput_size + 1; memset( buffer, 0, sizeof(buffer) ); @@ -2202,6 +2256,16 @@ static void test_GetRawInputBuffer(void) ok_ret( 0, GetRawInputBuffer( NULL, &size, sizeof(RAWINPUTHEADER) ) ); ok_eq( 0, size, UINT, "%u" ); + t3 = GetMessageTime(); + pos2 = GetMessagePos(); + extra_info2 = GetMessageExtraInfo(); + GetCursorPos(&pt); + ok( extra_info2 == extra_info1, "got %#Ix, %#Ix.\n", extra_info1, extra_info2 ); + ok( t3 > t1, "got %lu, %lu.\n", t1, t3 ); + ok( t3 < t2, "got %lu, %lu.\n", t2, t3 ); + ok( pos1 == pos2, "got pos1 (%ld, %ld), pos2 (%ld, %ld), pt (%ld %ld).\n", + pos1 & 0xffff, pos1 >> 16, pos2 & 0xffff, pos2 >> 16, pt.x, pt.y ); + raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = 0; ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE) ) ); diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 1083571802d..62b1707dbfe 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -454,6 +454,7 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data */ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT header_size ) { + struct user_thread_info *thread_info; UINT count; TRACE( "data %p, data_size %p, header_size %u\n", data, data_size, header_size ); @@ -473,6 +474,7 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade /* with old WOW64 mode we didn't go through the WOW64 thunks, patch the header size here */ if (NtCurrentTeb()->WowTebOffset) header_size = sizeof(RAWINPUTHEADER64); + thread_info = get_user_thread_info(); SERVER_START_REQ( get_rawinput_buffer ) { req->header_size = header_size; @@ -480,6 +482,7 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade if (!wine_server_call_err( req )) count = reply->count; else count = -1; *data_size = reply->next_size; + if (reply->count) thread_info->client_info.message_time = reply->time; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 48e778ce07f..d17f0936c3f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5473,8 +5473,10 @@ struct get_rawinput_buffer_reply { struct reply_header __header; data_size_t next_size; + unsigned int time; unsigned int count; /* VARARG(data,bytes); */ + char __pad_20[4]; }; @@ -6522,7 +6524,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 800 +#define SERVER_PROTOCOL_VERSION 801 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index f6d644d6182..37a39206ca4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3791,6 +3791,7 @@ struct handle_info int read_data; /* read the rawinput buffer data */ @REPLY data_size_t next_size; /* minimum size to get next message data */ + unsigned int time; /* time of the last removed message */ unsigned int count; VARARG(data,bytes); @END diff --git a/server/queue.c b/server/queue.c index ed099b3b989..cc10d0254eb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3751,6 +3751,7 @@ DECL_HANDLER(get_rawinput_buffer) memcpy( &rawinput->header + 1, msg_data + 1, data_size ); total_size += (rawinput->header.dwSize + align) & ~align; + reply->time = msg->time; list_remove( &msg->entry ); free_message( msg ); count++; diff --git a/server/request.h b/server/request.h index 5e85e31de45..5061e0ed399 100644 --- a/server/request.h +++ b/server/request.h @@ -2297,8 +2297,9 @@ C_ASSERT( FIELD_OFFSET(struct get_rawinput_buffer_request, header_size) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_rawinput_buffer_request, read_data) == 16 ); C_ASSERT( sizeof(struct get_rawinput_buffer_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_rawinput_buffer_reply, next_size) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_rawinput_buffer_reply, count) == 12 ); -C_ASSERT( sizeof(struct get_rawinput_buffer_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_rawinput_buffer_reply, time) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_rawinput_buffer_reply, count) == 16 ); +C_ASSERT( sizeof(struct get_rawinput_buffer_reply) == 24 ); C_ASSERT( sizeof(struct update_rawinput_devices_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_job_request, access) == 12 ); C_ASSERT( sizeof(struct create_job_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index d76d13152aa..f9c78ade989 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4503,6 +4503,7 @@ static void dump_get_rawinput_buffer_request( const struct get_rawinput_buffer_r static void dump_get_rawinput_buffer_reply( const struct get_rawinput_buffer_reply *req ) { fprintf( stderr, " next_size=%u", req->next_size ); + fprintf( stderr, ", time=%08x", req->time ); fprintf( stderr, ", count=%08x", req->count ); dump_varargs_bytes( ", data=", cur_size ); }

1 0

Daniel Lehman : msvcrt/tests: Add tests for _wcsicmp_l.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 243a014123b3f1b18e390720d843949240323fba URL: https://gitlab.winehq.org/wine/wine/-/commit/243a014123b3f1b18e390720d84394… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 1 15:31:44 2024 -0700 msvcrt/tests: Add tests for _wcsicmp_l. --- dlls/msvcrt/tests/locale.c | 35 +++++++++++++++++++++++++++++++++++ include/msvcrt/corecrt_wstring.h | 1 + 2 files changed, 36 insertions(+) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index ede9728517e..38dc62eb416 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -798,6 +798,40 @@ static void test___mb_cur_max_func(void) } } +static void test__wcsicmp_l(void) +{ + const struct { + const wchar_t *str1; + const wchar_t *str2; + int exp; + const char *loc; + } tests[] = { + { L"i", L"i", 0 }, + { L"I", L"i", 0 }, + { L"I", L"i", 0, "Turkish" }, + { L"i", L"a", 8 }, + { L"a", L"i", -8 }, + { L"i", L"a", 8, "Turkish" }, + }; + int ret, i; + + for(i=0; i<ARRAY_SIZE(tests); i++) { + _locale_t loc = NULL; + + if(tests[i].loc && !(loc = _create_locale(LC_ALL, tests[i].loc))) { + win_skip("locale %s not available. skipping\n", tests[i].loc); + continue; + } + + ret = _wcsicmp_l(tests[i].str1, tests[i].str2, loc); + ok(ret == tests[i].exp, "_wcsicmp_l = %d, expected %d for test %d '%ls' vs '%ls' using %s locale\n", + ret, tests[i].exp, i, tests[i].str1, tests[i].str2, loc ? tests[i].loc : "current"); + + if(loc) + _free_locale(loc); + } +} + START_TEST(locale) { init(); @@ -806,4 +840,5 @@ START_TEST(locale) test_setlocale(); test__Gettnames(); test___mb_cur_max_func(); + test__wcsicmp_l(); } diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 4d012800f65..02332787dc9 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -32,6 +32,7 @@ _ACRTIMP void* __cdecl memmove(void*,const void*,size_t); _ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); +_ACRTIMP int __cdecl _wcsicmp_l(const wchar_t*,const wchar_t*, _locale_t); _ACRTIMP int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); _ACRTIMP wchar_t* __cdecl _wcslwr(wchar_t*);

1 0

Brendan McGrath : winex11.drv: Increment mode_idx in {xrandr10,xf86vm}_get_modes.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: f6791f59c3a5fe2aa178edc66861d358de912d22 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6791f59c3a5fe2aa178edc66861d3… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu May 9 18:24:03 2024 +1000 winex11.drv: Increment mode_idx in {xrandr10,xf86vm}_get_modes. This fixes a regression introduced in f74900ad1a580eda8fd4923cbd4881b42b042733. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56655 --- dlls/winex11.drv/xrandr.c | 2 ++ dlls/winex11.drv/xvidmode.c | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 885c23a09a0..6cc3c277213 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -211,6 +211,7 @@ static BOOL xrandr10_get_modes( x11drv_settings_id id, DWORD flags, DEVMODEW **n add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width, sizes[size_idx].height, 0, size_idx, full ); mode = NEXT_DEVMODEW( mode ); + mode_idx++; continue; } @@ -219,6 +220,7 @@ static BOOL xrandr10_get_modes( x11drv_settings_id id, DWORD flags, DEVMODEW **n add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width, sizes[size_idx].height, rates[rate_idx], size_idx, full ); mode = NEXT_DEVMODEW( mode ); + mode_idx++; } } } diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f5e49409080..4f653c1cf6b 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -145,6 +145,7 @@ static BOOL xf86vm_get_modes( x11drv_settings_id id, DWORD flags, DEVMODEW **new { add_xf86vm_mode( mode, depths[depth_idx], xf86vm_modes[xf86vm_mode_idx], full ); mode = NEXT_DEVMODEW( mode ); + mode_idx++; } }

1 0

Nikolay Sivov : d2d1/effect: Fix GetImageLocalBounds() prototype.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: a1dadf3683e9961f4fa2dee138faea804cddcd49 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1dadf3683e9961f4fa2dee138faea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 23:13:32 2024 +0200 d2d1/effect: Fix GetImageLocalBounds() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 16 +++++++++++----- include/d2d1_1.idl | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 153c79583c7..8b1099b180b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2292,7 +2292,7 @@ static BOOL STDMETHODCALLTYPE d2d_device_context_IsBufferPrecisionSupported(ID2D return !!(support & D3D11_FORMAT_SUPPORT_BUFFER); } -static void STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1DeviceContext6 *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1DeviceContext6 *iface, ID2D1Image *image, D2D1_RECT_F *local_bounds) { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); @@ -2325,10 +2325,14 @@ static void STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1Device break; } ID2D1Bitmap_Release(bitmap); + + return S_OK; } else { FIXME("Unable to get local bounds of image %p.\n", image); + + return E_NOTIMPL; } } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5b74650ee46..9ae815dcc64 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12481,7 +12481,8 @@ static void test_effect_2d_affine(BOOL d3d11) } ID2D1Effect_GetOutput(effect, &output); - ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + hr = ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 1), "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", @@ -12603,7 +12604,9 @@ static void test_effect_crop(BOOL d3d11) ID2D1Effect_GetOutput(effect, &output); set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f); - ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + hr = ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 0), "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", @@ -13650,7 +13653,8 @@ static void test_image_bounds(BOOL d3d11) set_rect(&bounds, 0.0f, 0.0f, 0.0f, 0.0f); size = ID2D1Bitmap_GetSize(bitmap); - ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + hr = ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, size.width, size.height); @@ -13658,7 +13662,8 @@ static void test_image_bounds(BOOL d3d11) /* Test bitmap local bounds after changing context dpi */ ID2D1DeviceContext_GetDpi(context, &dpi_x, &dpi_y); ID2D1DeviceContext_SetDpi(context, dpi_x * 2.0f, dpi_y * 2.0f); - ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + hr = ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, size.width, size.height); @@ -13668,7 +13673,8 @@ static void test_image_bounds(BOOL d3d11) unit_mode = ID2D1DeviceContext_GetUnitMode(context); ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); - ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + hr = ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(compare_rect(&bounds, 0.0f, 0.0f, test->pixel_size.width, test->pixel_size.height, 0), "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 9da56050ecb..5560f24a38e 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -798,7 +798,7 @@ interface ID2D1DeviceContext : ID2D1RenderTarget BOOL IsBufferPrecisionSupported( [in] D2D1_BUFFER_PRECISION buffer_precision ); - void GetImageLocalBounds( + HRESULT GetImageLocalBounds( [in] ID2D1Image *image, [out] D2D1_RECT_F *local_bounds );

1 0

Nikolay Sivov : d2d1/tests: Add a test for effect output image interface query.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 3e3e347ed0391bde30bde205af5e551a312a12a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e3e347ed0391bde30bde205af5e55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 1 23:38:03 2024 +0200 d2d1/tests: Add a test for effect output image interface query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0337038aa8b..5b74650ee46 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10947,14 +10947,15 @@ static void test_builtin_effect(BOOL d3d11) unsigned int i, j, min_inputs, max_inputs, str_size, input_count; D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BUFFER_PRECISION precision; + ID2D1Effect *effect, *effect2; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Bitmap *bitmap; - ID2D1Effect *effect; D2D1_SIZE_U size; BYTE buffer[256]; + IUnknown *unk; BOOL cached; CLSID clsid; HRESULT hr; @@ -11009,6 +11010,17 @@ static void test_builtin_effect(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + + hr = ID2D1Image_QueryInterface(image_a, &IID_ID2D1Effect, (void **)&effect2); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect2 == effect, "Unexpected pointer.\n"); + ID2D1Effect_Release(effect2); + + hr = ID2D1Image_QueryInterface(image_a, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(unk == (IUnknown *)effect, "Unexpected pointer.\n"); + IUnknown_Release(unk); + ID2D1Image_Release(image_b); ID2D1Image_Release(image_a);

1 0

Elizabeth Figura : wined3d: Remove the no longer used Y correction variable.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: ba1ddc62ef95ecc62cdacfd0fdd39b961738973b URL: https://gitlab.winehq.org/wine/wine/-/commit/ba1ddc62ef95ecc62cdacfd0fdd39b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 19:28:33 2024 -0500 wined3d: Remove the no longer used Y correction variable. --- dlls/wined3d/context_gl.c | 1 - dlls/wined3d/glsl_shader.c | 48 +++++++----------------------------------- dlls/wined3d/shader.c | 2 -- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 9 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 6f7cf0eb3e3..95225a06172 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3607,7 +3607,6 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } - context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; } static void wined3d_context_gl_map_stage(struct wined3d_context_gl *context_gl, unsigned int stage, unsigned int unit) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b401a7afffb..d249f14bc8a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -227,7 +227,6 @@ struct glsl_ps_program GLint fog_end_location; GLint fog_scale_location; GLint alpha_test_ref_location; - GLint ycorrection_location; GLint np2_fixup_location; GLint color_key_location; const struct ps_np2fixup_info *np2_fixup_info; @@ -1918,20 +1917,6 @@ static void shader_glsl_load_constants(struct shader_glsl_priv *priv, checkGLcall("bump env uniforms"); } - if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) - { - const struct wined3d_vec4 correction_params = - { - /* Position is relative to the framebuffer, not the viewport. */ - 0.0f, - 1.0f, - 0.0f, - 0.0f, - }; - - GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, &correction_params.x)); - } - if (update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP) shader_glsl_load_np2fixup_constants(&prog->ps, gl_info, state); if (update_mask & WINED3D_SHADER_CONST_FFP_COLOR_KEY) @@ -4236,9 +4221,6 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - bool y_correction = ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL - ? priv->cur_ps_args->y_correction : false; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src_param; const char *instruction; @@ -4255,9 +4237,9 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; - case WINED3DSIH_DSY: instruction = y_correction ? "ycorrection.y * dFdy" : "dFdy"; break; - case WINED3DSIH_DSY_COARSE: instruction = y_correction ? "ycorrection.y * dFdyCoarse" : "dFdyCoarse"; break; - case WINED3DSIH_DSY_FINE: instruction = y_correction ? "ycorrection.y * dFdyFine" : "dFdyFine"; break; + case WINED3DSIH_DSY: instruction = "dFdy"; break; + case WINED3DSIH_DSY_COARSE: instruction = "dFdyCoarse"; break; + case WINED3DSIH_DSY_FINE: instruction = "dFdyFine"; break; case WINED3DSIH_FIRSTBIT_HI: instruction = "findMSB"; break; case WINED3DSIH_FIRSTBIT_LO: instruction = "findLSB"; break; case WINED3DSIH_FIRSTBIT_SHI: instruction = "findMSB"; break; @@ -8019,20 +8001,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[1].x, 4, gl_info); shader_addline(buffer, ";\n"); } - if (reg_maps->vpos && !gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - { - ++extra_constants_needed; - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - } if (reg_maps->vpos) { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) - shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", - args->y_correction ? "origin_upper_left, " : ""); - else if (args->y_correction) - shader_addline(buffer, "layout(origin_upper_left) in vec4 gl_FragCoord;\n"); + shader_addline(buffer, "layout(pixel_center_integer) in vec4 gl_FragCoord;\n"); } shader_addline(buffer, "vec4 vpos;\n"); } @@ -8123,14 +8097,11 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ * on drivers that returns integer values. */ if (reg_maps->vpos) { - if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - shader_addline(buffer, "vpos = gl_FragCoord;\n"); - else if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) - shader_addline(buffer, - "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); + if (!gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] + && (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER)) + shader_addline(buffer, "vpos = floor(gl_FragCoord);\n"); else - shader_addline(buffer, - "vpos = vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1);\n"); + shader_addline(buffer, "vpos = gl_FragCoord;\n"); } if (reg_maps->shader_version.major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) @@ -10342,7 +10313,6 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * ps->alpha_test_ref_location = GL_EXTCALL(glGetUniformLocation(program_id, "alpha_test_ref")); ps->np2_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "ps_samplerNP2Fixup")); - ps->ycorrection_location = GL_EXTCALL(glGetUniformLocation(program_id, "ycorrection")); ps->color_key_location = GL_EXTCALL(glGetUniformLocation(program_id, "color_key")); string_buffer_release(&priv->string_buffers, name); @@ -10862,8 +10832,6 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_I; if (pshader->reg_maps.boolean_constants) entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_B; - if (entry->ps.ycorrection_location != -1) - entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; shader_glsl_load_program_resources(context_gl, priv, program_id, pshader); shader_glsl_load_images(gl_info, priv, program_id, &pshader->reg_maps); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8cdb045c685..e08e59125b1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3054,8 +3054,6 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (d3d_info->emulated_flatshading) args->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; - args->y_correction = 0; - for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) { struct wined3d_rendertarget_view *rtv = state->fb.render_targets[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f2b6ff4723..05c6c1e42dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -523,7 +523,6 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_PS_BUMP_ENV 0x00000200 #define WINED3D_SHADER_CONST_PS_FOG 0x00000400 #define WINED3D_SHADER_CONST_PS_ALPHA_TEST 0x00000800 -#define WINED3D_SHADER_CONST_PS_Y_CORR 0x00001000 #define WINED3D_SHADER_CONST_PS_NP2_FIXUP 0x00002000 #define WINED3D_SHADER_CONST_FFP_MODELVIEW 0x00004000 #define WINED3D_SHADER_CONST_FFP_VERTEXBLEND 0x00008000 @@ -1499,10 +1498,9 @@ struct ps_compile_args DWORD pointsprite : 1; DWORD flatshading : 1; DWORD alpha_test_func : 3; - DWORD y_correction : 1; DWORD rt_alpha_swizzle : 8; /* WINED3D_MAX_RENDER_TARGETS, 8 */ DWORD dual_source_blend : 1; - DWORD padding : 17; + DWORD padding : 18; }; enum fog_src_type

1 0

Elizabeth Figura : wined3d: Remove the no longer used render_offscreen field from struct ds_compile_args.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: d1ce00e4292344780fb094b7feaeffb816f62a5d URL: https://gitlab.winehq.org/wine/wine/-/commit/d1ce00e4292344780fb094b7feaeff… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 19:18:51 2024 -0500 wined3d: Remove the no longer used render_offscreen field from struct ds_compile_args. --- dlls/wined3d/glsl_shader.c | 10 ++-------- dlls/wined3d/shader.c | 2 -- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 08e7d359bf6..b401a7afffb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8517,16 +8517,10 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl switch (args->tessellator_output_primitive) { case WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: - if (args->render_offscreen) - shader_addline(buffer, ", ccw"); - else - shader_addline(buffer, ", cw"); + shader_addline(buffer, ", ccw"); break; case WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: - if (args->render_offscreen) - shader_addline(buffer, ", cw"); - else - shader_addline(buffer, ", ccw"); + shader_addline(buffer, ", cw"); break; case WINED3D_TESSELLATOR_OUTPUT_POINT: shader_addline(buffer, ", point_mode"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2b78c2df150..8cdb045c685 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2762,8 +2762,6 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 : pixel_shader ? pixel_shader->limits->packed_input : shader->limits->packed_output; args->next_shader_type = geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL; - args->render_offscreen = 1; - init_interpolation_compile_args(args->interpolation_mode, args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, context->d3d_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a28255e2d1d..1f2b6ff4723 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1531,8 +1531,7 @@ struct ds_compile_args enum wined3d_tessellator_partitioning tessellator_partitioning; unsigned int output_count : 16; unsigned int next_shader_type : 3; - unsigned int render_offscreen : 1; - unsigned int padding : 12; + unsigned int padding : 13; uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; };

1 0