May 2019 - Wine-devel - list.winehq.org

[PATCH 1/2] xaudio2: Fix support for FAudio 19.06 and newer
by elee＠codeweavers.com 02 May '19

02 May '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/x3daudio.c | 4 ++++ dlls/xaudio2_7/xapo.c | 2 ++ dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index ee3367e092..f08a425ca1 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -51,8 +51,12 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); +#if FAUDIO_ABI_VERSION >= 1 + return F3DAudioInitialize8(chanmask, speedofsound, handle); +#else F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; +#endif } #endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 9788cb38e8..0b2a5932a5 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -330,8 +330,10 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) return FAPOFX_CreateFXWithCustomAllocatorEXT( (const FAudioGUID*) clsid, fapo, +#if FAUDIO_ABI_VERSION < 1 NULL, 0, +#endif XAudio_Internal_Malloc, XAudio_Internal_Free, XAudio_Internal_Realloc diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index cbbedc4f7f..0f7ae36e66 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1796,9 +1796,13 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x)\n", This, operationSet); +#if FAUDIO_ABI_VERSION >= 1 + return FAudio_CommitChanges(This->faudio, operationSet); +#else return FAudio_CommitChanges(This->faudio); +#endif } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, -- 2.21.0

7 14

[PATCH] include: added typedef UMS_CREATE_THREAD_ATTRIBUTES
by romanstingler 02 May '19

02 May '19

--- include/winbase.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 6c97afe9fd..a3082661b2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1714,6 +1714,12 @@ typedef struct _UMS_SCHEDULER_STARTUP_INFO PVOID SchedulerParam; } UMS_SCHEDULER_STARTUP_INFO, *PUMS_SCHEDULER_STARTUP_INFO; +typedef struct _UMS_CREATE_THREAD_ATTRIBUTES { + DWORD UmsVersion; + PVOID UmsContext; + PVOID UmsCompletionList; +} UMS_CREATE_THREAD_ATTRIBUTES, *PUMS_CREATE_THREAD_ATTRIBUTES; + typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON; typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS; -- 2.21.0

1 1

[PATCH 1/7] ntdll: Implement RtlGetSystemTimePrecise().
by Huw Davies 02 May '19

02 May '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/time.c | 33 +++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 35 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 292b0f6a9f..aeb9735ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -680,6 +680,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) # @ stub RtlGetSecurityDescriptorRMControl # @ stub RtlGetSetBootStatusData +@ stdcall -ret64 RtlGetSystemTimePrecise() @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() @ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 443d8b26be..d0a7954377 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -474,6 +474,39 @@ NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) return STATUS_SUCCESS; } +/*********************************************************************** + * RtlGetSystemTimePrecise [NTDLL.@] + * + * Get a more accurate current system time. + * + * RETURNS + * The current system time. + */ +LONGLONG WINAPI RtlGetSystemTimePrecise( void ) +{ + LONGLONG time; + +#if defined(HAVE_CLOCK_GETTIME) + struct timespec ts; + + if (!clock_gettime( CLOCK_REALTIME, &ts )) + { + time = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time += (ts.tv_nsec + 50) / 100; + } + else +#endif + { + struct timeval now; + + gettimeofday( &now, 0 ); + time = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time += now.tv_usec * 10; + } + + return time; +} + /****************************************************************************** * NtQueryPerformanceCounter [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 2b3fb947b9..e7f89b0059 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2710,6 +2710,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSI NTSYSAPI ULONG WINAPI RtlGetProcessHeaps(ULONG,HANDLE*); NTSYSAPI DWORD WINAPI RtlGetThreadErrorMode(void); NTSYSAPI NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); +NTSYSAPI LONGLONG WINAPI RtlGetSystemTimePrecise(void); NTSYSAPI NTSTATUS WINAPI RtlGetVersion(RTL_OSVERSIONINFOEXW*); NTSYSAPI NTSTATUS WINAPI RtlGUIDFromString(PUNICODE_STRING,GUID*); NTSYSAPI PSID_IDENTIFIER_AUTHORITY WINAPI RtlIdentifierAuthoritySid(PSID); -- 2.17.1

2 3

[PATCH 1/4] mfplat: Implement async file stream creation API.
by Nikolay Sivov 02 May '19

02 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 257 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/tests/mfplat.c | 67 ++++++++++ include/mfapi.h | 4 + 4 files changed, 331 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 05ee1070af..83c8d34b92 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6713,3 +6713,260 @@ HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **time_source) return S_OK; } + +struct async_create_file +{ + IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; + MF_FILE_ACCESSMODE access_mode; + MF_FILE_OPENMODE open_mode; + MF_FILE_FLAGS flags; + WCHAR *path; +}; + +struct async_create_file_result +{ + struct list entry; + IMFAsyncResult *result; + IMFByteStream *stream; +}; + +static struct list async_create_file_results = LIST_INIT(async_create_file_results); +static CRITICAL_SECTION async_create_file_cs = { NULL, -1, 0, 0, 0, 0 }; + +static struct async_create_file *impl_from_create_file_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct async_create_file, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI async_create_file_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI async_create_file_callback_AddRef(IMFAsyncCallback *iface) +{ + struct async_create_file *async = impl_from_create_file_IMFAsyncCallback(iface); + ULONG refcount = InterlockedIncrement(&async->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI async_create_file_callback_Release(IMFAsyncCallback *iface) +{ + struct async_create_file *async = impl_from_create_file_IMFAsyncCallback(iface); + ULONG refcount = InterlockedDecrement(&async->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(async->path); + heap_free(async); + } + + return refcount; +} + +static HRESULT WINAPI async_create_file_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI async_create_file_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct async_create_file *async = impl_from_create_file_IMFAsyncCallback(iface); + IMFAsyncResult *caller; + IMFByteStream *stream; + HRESULT hr; + + caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); + + hr = MFCreateFile(async->access_mode, async->open_mode, async->flags, async->path, &stream); + if (SUCCEEDED(hr)) + { + struct async_create_file_result *result_item; + + result_item = heap_alloc(sizeof(*result_item)); + if (result_item) + { + result_item->result = caller; + IMFAsyncResult_AddRef(caller); + result_item->stream = stream; + IMFByteStream_AddRef(stream); + + EnterCriticalSection(&async_create_file_cs); + list_add_tail(&async_create_file_results, &result_item->entry); + LeaveCriticalSection(&async_create_file_cs); + } + + IMFByteStream_Release(stream); + } + else + IMFAsyncResult_SetStatus(caller, hr); + + MFInvokeCallback(caller); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl async_create_file_callback_vtbl = +{ + async_create_file_callback_QueryInterface, + async_create_file_callback_AddRef, + async_create_file_callback_Release, + async_create_file_callback_GetParameters, + async_create_file_callback_Invoke, +}; + +static WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if (str) + { + unsigned int size; + + size = (strlenW(str) + 1) * sizeof(WCHAR); + ret = heap_alloc(size); + if (ret) + memcpy(ret, str, size); + } + + return ret; +} + +/*********************************************************************** + * MFBeginCreateFile (mfplat.@) + */ +HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags, + const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie) +{ + struct async_create_file *async = NULL; + IMFAsyncResult *caller, *item = NULL; + HRESULT hr; + + TRACE("%#x, %#x, %#x, %s, %p, %p, %p.\n", access_mode, open_mode, flags, debugstr_w(path), callback, state, + cancel_cookie); + + if (cancel_cookie) + *cancel_cookie = NULL; + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) + return hr; + + async = heap_alloc(sizeof(*async)); + if (!async) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + async->IMFAsyncCallback_iface.lpVtbl = &async_create_file_callback_vtbl; + async->refcount = 1; + async->access_mode = access_mode; + async->open_mode = open_mode; + async->flags = flags; + async->path = heap_strdupW(path); + if (!async->path) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + hr = MFCreateAsyncResult(NULL, &async->IMFAsyncCallback_iface, (IUnknown *)caller, &item); + if (FAILED(hr)) + goto failed; + + if (cancel_cookie) + { + *cancel_cookie = (IUnknown *)caller; + IUnknown_AddRef(*cancel_cookie); + } + + hr = MFInvokeCallback(item); + +failed: + if (async) + IMFAsyncCallback_Release(&async->IMFAsyncCallback_iface); + if (item) + IMFAsyncResult_Release(item); + if (caller) + IMFAsyncResult_Release(caller); + + return hr; +} + +static HRESULT async_create_file_pull_result(IUnknown *unk, IMFByteStream **stream) +{ + struct async_create_file_result *item; + HRESULT hr = MF_E_UNEXPECTED; + IMFAsyncResult *result; + + *stream = NULL; + + if (FAILED(IUnknown_QueryInterface(unk, &IID_IMFAsyncResult, (void **)&result))) + return hr; + + EnterCriticalSection(&async_create_file_cs); + + LIST_FOR_EACH_ENTRY(item, &async_create_file_results, struct async_create_file_result, entry) + { + if (result == item->result) + { + *stream = item->stream; + IMFAsyncResult_Release(item->result); + list_remove(&item->entry); + heap_free(item); + break; + } + } + + LeaveCriticalSection(&async_create_file_cs); + + if (*stream) + hr = IMFAsyncResult_GetStatus(result); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFEndCreateFile (mfplat.@) + */ +HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream) +{ + TRACE("%p, %p.\n", result, stream); + + return async_create_file_pull_result((IUnknown *)result, stream); +} + +/*********************************************************************** + * MFCancelCreateFile (mfplat.@) + */ +HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie) +{ + IMFByteStream *stream = NULL; + HRESULT hr; + + TRACE("%p.\n", cancel_cookie); + + hr = async_create_file_pull_result(cancel_cookie, &stream); + + if (stream) + IMFByteStream_Release(stream); + + return hr; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 7823ac0d9e..3ebbdbdd4b 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -20,14 +20,14 @@ @ stdcall MFAllocateWorkQueueEx(long ptr) @ stub MFAppendCollection @ stub MFAverageTimePerFrameToFrameRate -@ stub MFBeginCreateFile +@ stdcall MFBeginCreateFile(long long long wstr ptr ptr ptr) @ stub MFBeginGetHostByName @ stub MFBeginRegisterWorkQueueWithMMCSS @ stub MFBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread @ stub MFCalculateBitmapImageSize @ stdcall MFCalculateImageSize(ptr long long ptr) -@ stub MFCancelCreateFile +@ stdcall MFCancelCreateFile(ptr) @ stdcall MFCancelWorkItem(int64) @ stdcall MFCompareFullToPartialMediaType(ptr ptr) @ stub MFCompareSockaddrAddresses @@ -79,7 +79,7 @@ @ stub MFDeserializeEvent @ stub MFDeserializeMediaTypeFromStream @ stub MFDeserializePresentationDescriptor -@ stub MFEndCreateFile +@ stdcall MFEndCreateFile(ptr ptr) @ stub MFEndGetHostByName @ stub MFEndRegisterWorkQueueWithMMCSS @ stub MFEndUnregisterWorkQueueWithMMCSS diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b349c51af3..d2ae8f2a85 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2886,6 +2886,72 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) IMFMediaType_Release(mediatype); } +static HRESULT WINAPI test_create_file_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + IMFByteStream *stream; + IUnknown *object; + HRESULT hr; + + ok(!!result, "Unexpected result object.\n"); + + ok((IUnknown *)iface == IMFAsyncResult_GetStateNoAddRef(result), "Unexpected result state.\n"); + + hr = IMFAsyncResult_GetObject(result, &object); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFEndCreateFile(result, &stream); + ok(hr == S_OK, "Failed to get file stream, hr %#x.\n", hr); + IMFByteStream_Release(stream); + + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl test_create_file_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + test_create_file_callback_Invoke, +}; + +static void test_async_create_file(void) +{ + struct test_callback callback = { { &test_create_file_callback_vtbl } }; + WCHAR pathW[MAX_PATH], fileW[MAX_PATH]; + IUnknown *cancel_cookie; + HRESULT hr; + BOOL ret; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Fail to start up, hr %#x.\n", hr); + + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + GetTempFileNameW(pathW, NULL, 0, fileW); + + hr = MFBeginCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_DELETE_IF_EXIST, MF_FILEFLAGS_NONE, fileW, + &callback.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface, &cancel_cookie); + ok(hr == S_OK, "Async create request failed, hr %#x.\n", hr); + ok(cancel_cookie != NULL, "Unexpected cancellation object.\n"); + + WaitForSingleObject(callback.event, INFINITE); + + IUnknown_Release(cancel_cookie); + + CloseHandle(callback.event); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + ret = DeleteFileW(fileW); + ok(ret, "Failed to delete test file.\n"); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -2920,6 +2986,7 @@ START_TEST(mfplat) test_attributes_serialization(); test_wrapped_media_type(); test_MFCreateWaveFormatExFromMFMediaType(); + test_async_create_file(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index cee9d403c4..d172db147a 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -353,7 +353,10 @@ typedef enum _MFWaveFormatExConvertFlags HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); +HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags, + const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size); +HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); BOOL WINAPI MFCompareFullToPartialMediaType(IMFMediaType *full_type, IMFMediaType *partial_type); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); @@ -370,6 +373,7 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); +HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); -- 2.20.1

2 5

[PATCH 3/7] ntdll: Use CLOCK_REALTIME_COARSE for NtQuerySystemTime() if it has sufficient resolution.
by Huw Davies 02 May '19

02 May '19

This will only affect users running with HZ=1000. On an i7-8700 CPU @ 3.20GHz it cuts the call cost from ~30ns to ~12ns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/time.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index d0a7954377..37401ce2e1 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -458,19 +458,43 @@ void WINAPI RtlTimeToElapsedTimeFields( const LARGE_INTEGER *Time, PTIME_FIELDS * Get the current system time. * * PARAMS - * Time [O] Destination for the current system time. + * time [O] Destination for the current system time. * * RETURNS * Success: STATUS_SUCCESS. * Failure: An NTSTATUS error code indicating the problem. */ -NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) +NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) { - struct timeval now; +#if defined(HAVE_CLOCK_GETTIME) + struct timespec ts; + static clockid_t clock_id = -1; - gettimeofday( &now, 0 ); - Time->QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - Time->QuadPart += now.tv_usec * 10; + if (clock_id == -1) + { + struct timespec res; + + /* Use CLOCK_REALTIME_COARSE if it has 1 ms or better resolution */ + if (!clock_getres( CLOCK_REALTIME_COARSE, &res ) && res.tv_sec == 0 && res.tv_nsec <= 1000000) + clock_id = CLOCK_REALTIME_COARSE; + else + clock_id = CLOCK_REALTIME; + } + + if (!clock_gettime( clock_id, &ts )) + { + time->QuadPart = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time->QuadPart += (ts.tv_nsec + 50) / 100; + } + else +#endif + { + struct timeval now; + + gettimeofday( &now, 0 ); + time->QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time->QuadPart += now.tv_usec * 10; + } return STATUS_SUCCESS; } -- 2.17.1

3 3

[PATCH] include: Add missing defines, enums and functions for dwmapi.h
by Vijay Kiran Kamuju 02 May '19

02 May '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/dwmapi.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/dwmapi.h b/include/dwmapi.h index b2f39deae55..ccf121f578a 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -34,9 +34,46 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; #include <pshpack1.h> +static const UINT c_DwmMaxQueuedBuffers = 8; +static const UINT c_DwmMaxMonitors = 16; +static const UINT c_DwmMaxAdapters = 16; + typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +enum DWMWINDOWATTRIBUTE { + DWMWA_NCRENDERING_ENABLED, + DWMWA_NCRENDERING_POLICY, + DWMWA_TRANSITIONS_FORCEDISABLED, + DWMWA_ALLOW_NCPAINT, + DWMWA_CAPTION_BUTTON_BOUNDS, + DWMWA_NONCLIENT_RTL_LAYOUT, + DWMWA_FORCE_ICONIC_REPRESENTATION, + DWMWA_FLIP3D_POLICY, + DWMWA_EXTENDED_FRAME_BOUNDS, + DWMWA_HAS_ICONIC_BITMAP, + DWMWA_DISALLOW_PEEK, + DWMWA_EXCLUDED_FROM_PEEK, + DWMWA_CLOAK, + DWMWA_CLOAKED, + DWMWA_FREEZE_REPRESENTATION, + DWMWA_LAST +}; + +enum DWMNCRENDERINGPOLICY { + DWMNCRP_USEWINDOWSTYLE, + DWMNCRP_DISABLED, + DWMNCRP_ENABLED, + DWMNCRP_LAST +}; + +enum DWMFLIP3DWINDOWPOLICY { + DWMFLIP3D_DEFAULT, + DWMFLIP3D_EXCLUDEBELOW, + DWMFLIP3D_EXCLUDEABOVE, + DWMFLIP3D_LAST +}; + typedef enum _DWM_SOURCE_FRAME_SAMPLING { DWM_SOURCE_FRAME_SAMPLING_POINT, DWM_SOURCE_FRAME_SAMPLING_COVERAGE, @@ -101,6 +138,11 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_FRAME_DURATION_DEFAULT -1 + +#define DWM_EC_DISABLECOMPOSITION 0 +#define DWM_EC_ENABLECOMPOSITION 1 + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -113,6 +155,18 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#define DWM_SIT_DISPLAYFRAME 0x00000001 + +#define DWM_CLOAKED_APP 0x00000001 +#define DWM_CLOAKED_SHELL 0x00000002 +#define DWM_CLOAKED_INHERITED 0x00000003 + +#define DWM_TNP_RECTDESTINATION 0x00000001 +#define DWM_TNP_RECTSOURCE 0x00000002 +#define DWM_TNP_OPACITY 0x00000004 +#define DWM_TNP_VISIBLE 0x00000008 +#define DWM_TNP_SOURCECLIENTAREAONLY 0x00000010 + typedef struct _DWM_THUMBNAIL_PROPERTIES { DWORD dwFlags; @@ -136,16 +190,25 @@ typedef struct _DWM_PRESENT_PARAMETERS { #include <poppack.h> +DWMAPI DwmAttachMilContent(HWND); DWMAPI_(BOOL) DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI DwmDetachMilContent(HWND); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); +DWMAPI DwmFlush(); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); +DWMAPI DwmGetGraphicsStreamClient(UINT, UUID *); +DWMAPI DwmGetGraphicsStreamTransformHint(UINT, MilMatrix3x2D *); +DWMAPI DwmGetTransportAttributes(BOOL*, BOOL*, DWORD*); +DWMAPI DwmGetWindowAttribute(HWND, DWORD, PVOID, DWORD); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetIconicLivePreviewBitmap(HWND, HBITMAP, POINT*, DWORD); +DWMAPI DwmSetIconicThumbnail(HWND, HBITMAP, DWORD); DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); -- 2.17.0

1 0

[PATCH 5/5] wined3d: Introduce wined3d_context_init().
by Henri Verbeet 02 May '19

02 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 83 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4b6aaa9270b..223e6b22962 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1882,22 +1882,12 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, +static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; - struct wined3d_context_gl *context_gl; - struct wined3d_context *context; DWORD state; - TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); - - wined3d_from_cs(device->cs); - - if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) - return NULL; - context = &context_gl->c; - list_init(&context->timestamp_queries); list_init(&context->occlusion_queries); list_init(&context->fences); @@ -1910,31 +1900,28 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!device->shader_backend->shader_allocate_context_data(context)) { ERR("Failed to allocate shader backend context data.\n"); - goto out; + return FALSE; } + if (!device->adapter->fragment_pipe->allocate_context_data(context)) { ERR("Failed to allocate fragment pipeline context data.\n"); - goto out; + device->shader_backend->shader_free_context_data(context); + return FALSE; } if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); - if ((context->hdc = swapchain_get_backup_dc(swapchain))) - context->hdc_is_private = TRUE; - else + if (!(context->hdc = swapchain_get_backup_dc(swapchain))) { ERR("Failed to retrieve a device context.\n"); - goto out; + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + return FALSE; } - } - - if (!device_context_add(device, context)) - { - ERR("Failed to add the newly created context to the context list\n"); - goto out; + context->hdc_is_private = TRUE; } context->win_handle = swapchain->win_handle; @@ -1956,13 +1943,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->current_rt.sub_resource_idx = 0; context->tid = GetCurrentThreadId(); - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) - { - device_context_remove(device, context); - goto out; - } - - device->shader_backend->shader_init_context_state(context); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) | (1u << WINED3D_SHADER_TYPE_GEOMETRY) @@ -1970,13 +1950,50 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, | (1u << WINED3D_SHADER_TYPE_DOMAIN) | (1u << WINED3D_SHADER_TYPE_COMPUTE); + return TRUE; +} + +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; + struct wined3d_context *context; + + TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); + + wined3d_from_cs(device->cs); + + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) + return NULL; + context = &context_gl->c; + + if (!(wined3d_context_init(context, swapchain, target, ds_format))) + { + heap_free(context_gl); + return NULL; + } + + if (!device_context_add(device, context)) + { + ERR("Failed to add the newly created context to the context list\n"); + goto fail; + } + + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + { + device_context_remove(device, context); + goto fail; + } + + device->shader_backend->shader_init_context_state(context); + TRACE("Created context %p.\n", context); return context; -out: - if (context->hdc) - wined3d_release_dc(swapchain->win_handle, context->hdc); +fail: + wined3d_release_dc(context->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); heap_free(context_gl); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Introduce a separate structure for OpenGL context information.
by Henri Verbeet 02 May '19

02 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 50155861331..4b6aaa9270b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1886,6 +1886,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; DWORD state; @@ -1893,8 +1894,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, wined3d_from_cs(device->cs); - if (!(context = heap_alloc_zero(sizeof(*context)))) + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) return NULL; + context = &context_gl->c; list_init(&context->timestamp_queries); list_init(&context->occlusion_queries); @@ -1977,7 +1979,7 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context); + heap_free(context_gl); return NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index daba66932f7..138cefb5ffe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2029,6 +2029,11 @@ struct wined3d_context unsigned int scissor_rect_count; }; +struct wined3d_context_gl +{ + struct wined3d_context c; +}; + struct wined3d_fb_state { struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS]; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Get rid of the redundant "device" parameter to context_destroy().
by Henri Verbeet 02 May '19

02 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f4179d7d206..50155861331 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1581,7 +1581,7 @@ void context_release(struct wined3d_context *context) if (context->destroy_delayed) { TRACE("Destroying context %p.\n", context); - context_destroy(context->device, context); + wined3d_context_destroy(context); } } } @@ -2280,8 +2280,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, return TRUE; } -void context_destroy(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_context_destroy(struct wined3d_context *context) { + struct wined3d_device *device = context->device; BOOL destroy; TRACE("Destroying ctx %p\n", context); @@ -2289,7 +2290,8 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont wined3d_from_cs(device->cs); /* We delay destroying a context when it is active. The context_release() - * function invokes context_destroy() again while leaving the last level. */ + * function invokes wined3d_context_destroy() again while leaving the last + * level. */ if (context->level) { TRACE("Delaying destruction of context %p.\n", context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 23ba41c56b4..e25565da7f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1019,7 +1019,7 @@ static void wined3d_device_delete_opengl_contexts_cs(void *object) if (device->contexts[0]->swapchain) swapchain_destroy_contexts(device->contexts[0]->swapchain); else - context_destroy(device, device->contexts[0]); + wined3d_context_destroy(device->contexts[0]); } } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c1429de91b1..4ac091f6924 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1095,7 +1095,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain if (!(ctx_array = heap_calloc(swapchain->num_contexts + 1, sizeof(*ctx_array)))) { ERR("Out of memory when trying to allocate a new context array\n"); - context_destroy(swapchain->device, ctx); + wined3d_context_destroy(ctx); return NULL; } memcpy(ctx_array, swapchain->context, sizeof(*ctx_array) * swapchain->num_contexts); @@ -1114,7 +1114,7 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) for (i = 0; i < swapchain->num_contexts; ++i) { - context_destroy(swapchain->device, swapchain->context[i]); + wined3d_context_destroy(swapchain->context[i]); } heap_free(swapchain->context); swapchain->num_contexts = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14444cb181f..daba66932f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2189,7 +2189,7 @@ void context_copy_bo_address(struct wined3d_context *context, struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Use shader_glsl_append_imm_vec4() in shader_glsl_get_register_name().
by Henri Verbeet 02 May '19

02 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 86 ++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a71af2f25bc..47eb6f2b790 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -420,26 +420,43 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values, - const struct wined3d_gl_info *gl_info) +static void shader_glsl_append_imm_vec(struct wined3d_string_buffer *buffer, + const float *values, unsigned int size, const struct wined3d_gl_info *gl_info) { - char str[4][17]; - - wined3d_ftoa(values[0], str[0]); - wined3d_ftoa(values[1], str[1]); - wined3d_ftoa(values[2], str[2]); - wined3d_ftoa(values[3], str[3]); + const int *int_values = (const int *)values; + unsigned int i; + char str[17]; - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + if (!gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - const unsigned int *uint_values = (const unsigned int *)values; + if (size > 1) + shader_addline(buffer, "vec%u(", size); + + for (i = 0; i < size; ++i) + { + wined3d_ftoa(values[i], str); + shader_addline(buffer, i ? ", %s" : "%s", str); + } + + if (size > 1) + shader_addline(buffer, ")"); - shader_addline(buffer, "intBitsToFloat(ivec4(%#x, %#x, %#x, %#x))\n" - " /* %s, %s, %s, %s */", uint_values[0], uint_values[1], - uint_values[2], uint_values[3], str[0], str[1], str[2], str[3]); + return; } - else - shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); + + shader_addline(buffer, "intBitsToFloat("); + if (size > 1) + shader_addline(buffer, "ivec%u(", size); + + for (i = 0; i < size; ++i) + { + wined3d_ftoa(values[i], str); + shader_addline(buffer, i ? ", %#x /* %s */" : "%#x /* %s */", int_values[i], str); + } + + if (size > 1) + shader_addline(buffer, ")"); + shader_addline(buffer, ")"); } static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, @@ -2796,7 +2813,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); - shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value, gl_info); + shader_glsl_append_imm_vec(buffer, (const float *)lconst->value, ARRAY_SIZE(lconst->value), gl_info); shader_addline(buffer, ";\n"); } } @@ -2903,7 +2920,6 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; - char imm_str[4][17]; if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) shader_glsl_add_src_param_ext(ctx, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, @@ -3139,15 +3155,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - { - string_buffer_sprintf(register_name, "intBitsToFloat(%#x)", reg->u.immconst_data[0]); - } - else - { - wined3d_ftoa(*(const float *)reg->u.immconst_data, imm_str[0]); - string_buffer_sprintf(register_name, "%s", imm_str[0]); - } + string_buffer_clear(register_name); + shader_glsl_append_imm_vec(register_name, (const float *)reg->u.immconst_data, 1, gl_info); break; case WINED3D_DATA_INT: string_buffer_sprintf(register_name, "%#x", reg->u.immconst_data[0]); @@ -3169,21 +3178,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - { - string_buffer_sprintf(register_name, "intBitsToFloat(ivec4(%#x, %#x, %#x, %#x))", - reg->u.immconst_data[0], reg->u.immconst_data[1], - reg->u.immconst_data[2], reg->u.immconst_data[3]); - } - else - { - wined3d_ftoa(*(const float *)&reg->u.immconst_data[0], imm_str[0]); - wined3d_ftoa(*(const float *)&reg->u.immconst_data[1], imm_str[1]); - wined3d_ftoa(*(const float *)&reg->u.immconst_data[2], imm_str[2]); - wined3d_ftoa(*(const float *)&reg->u.immconst_data[3], imm_str[3]); - string_buffer_sprintf(register_name, "vec4(%s, %s, %s, %s)", - imm_str[0], imm_str[1], imm_str[2], imm_str[3]); - } + string_buffer_clear(register_name); + shader_glsl_append_imm_vec(register_name, (const float *)reg->u.immconst_data, 4, gl_info); break; case WINED3D_DATA_INT: string_buffer_sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", @@ -7968,10 +7964,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context if (args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -9825,10 +9821,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); shader_addline(buffer, ";\n"); } -- 2.11.0

1 0