July 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/vmr9: Auto-show the window when pausing, not when running.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 44c0e691379afeba50e39c81624702af89a10e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c0e691379afeba50e39c81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:18 2020 -0500 quartz/vmr9: Auto-show the window when pausing, not when running. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/vmr9.c | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index adf677535b..cf4675ce06 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2130,14 +2130,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 005b10974f..e953c05dd1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2376,14 +2376,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a540feb237..aeaefd52c6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -477,13 +477,19 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE return VFW_E_TYPE_NOT_ACCEPTED; } -static void vmr_start_stream(struct strmbase_renderer *iface) +static void vmr_init_stream(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); if (filter->window.hwnd && filter->window.AutoShow) ShowWindow(filter->window.hwnd, SW_SHOW); +} + +static void vmr_start_stream(struct strmbase_renderer *iface) +{ + struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + + IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); SetEvent(filter->run_event); } @@ -659,6 +665,7 @@ static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, + .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow,

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in nt_to_unix_file_name() and related helpers.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 1037bf54bf056090855c3e2dc8c70193f18a243e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1037bf54bf056090855c3e2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:32:31 2020 +0200 ntdll: Use malloc() to allocate the buffer in nt_to_unix_file_name() and related helpers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 63 +++++++++++++++++------------------------------ dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/process.c | 2 +- 3 files changed, 25 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1037bf54bf056090855c…

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in unix_to_nt_file_name().
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: ef01f6ac1338dcb100bc2ff5cd1cf360d7d8520f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef01f6ac1338dcb100bc2ff5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:32:04 2020 +0200 ntdll: Use malloc() to allocate the buffer in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 4 ++-- dlls/ntdll/unix/file.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 039e5475fe..74cea11be5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1064,7 +1064,7 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char { if (unix_to_nt_file_name( path, &nt_name )) return; append_envW( env, pos, name, nt_name ); - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } } @@ -1217,7 +1217,7 @@ void CDECL get_initial_directory( UNICODE_STRING *dir ) memcpy( dir->Buffer, nt_name, dir->Length ); dir->Buffer[1] = '\\'; } - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 085052225d..79b87cf99b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1834,7 +1834,7 @@ static NTSTATUS fill_name_info( const char *unix_name, FILE_NAME_INFORMATION *in else *name_len = info->FileNameLength; memcpy( info->FileName, ptr, *name_len ); - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } return status; @@ -3447,8 +3447,7 @@ NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; lenW = wcslen( prefix ); - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, (lenA + lenW + 1) * sizeof(WCHAR) ))) - return STATUS_NO_MEMORY; + if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); buffer[lenW] = 0; @@ -3474,7 +3473,7 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_ if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); else status = STATUS_BUFFER_TOO_SMALL; *size = wcslen(nt_name) + 1; - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } return status; } @@ -6411,7 +6410,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas wcscpy( p->Name.Buffer, nt_name ); } if (used_len) *used_len = sizeof(*p) + size; - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } RtlFreeHeap( GetProcessHeap(), 0, unix_name ); break;

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in server_get_unix_name().
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 9ec5be2cea3af2ca631ef0dce3208965058abb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec5be2cea3af2ca631ef0dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:32:55 2020 +0200 ntdll: Use malloc() to allocate the buffer in server_get_unix_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 51a7c9b5d1..0b9ad4bc22 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1777,8 +1777,7 @@ static NTSTATUS server_get_unix_name( HANDLE handle, char **unix_name ) for (;;) { - name = RtlAllocateHeap( GetProcessHeap(), 0, size + 1 ); - if (!name) return STATUS_NO_MEMORY; + if (!(name = malloc( size + 1 ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_handle_unix_name ) { @@ -1795,7 +1794,7 @@ static NTSTATUS server_get_unix_name( HANDLE handle, char **unix_name ) *unix_name = name; break; } - RtlFreeHeap( GetProcessHeap(), 0, name ); + free( name ); if (ret != STATUS_BUFFER_OVERFLOW) break; } return ret; @@ -1962,7 +1961,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni if ((status = server_get_unix_name( handle, &unix_name ))) return status; letter = find_dos_device( unix_name ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); if (letter == -1) { @@ -3985,7 +3984,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->AlignmentInformation.AlignmentRequirement = 1; /* FIXME */ io->u.Status = fill_name_info( unix_name, &info->NameInformation, &name_len ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); io->Information = FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + name_len; } } @@ -4037,7 +4036,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { LONG name_len = len - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); io->u.Status = fill_name_info( unix_name, info, &name_len ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; } } @@ -4072,7 +4071,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->EndOfFile = std.EndOfFile; info->FileAttributes = basic.FileAttributes; } - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); } } break; @@ -6395,7 +6394,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas if (used_len) *used_len = sizeof(*p) + size; free( nt_name ); } - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); break; } else if (status != STATUS_OBJECT_TYPE_MISMATCH) break;

1 0

Zebediah Figura : quartz: Use calloc() in filter_graph_common_create().
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 02485967d6b8e66a5321e419bf9d92763fd370a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02485967d6b8e66a5321e419… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:15 2020 -0500 quartz: Use calloc() in filter_graph_common_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 110 ++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a23e35d6a1..8c20678989 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -510,7 +510,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->message_thread_ret); } DeleteCriticalSection(&This->cs); - CoTaskMemFree(This); + free(This); InterlockedDecrement(&object_locks); } @@ -5377,80 +5377,64 @@ static const IUnknownVtbl IInner_VTable = static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL threaded) { - IFilterGraphImpl *fimpl; + IFilterGraphImpl *object; HRESULT hr; *out = NULL; - fimpl = CoTaskMemAlloc(sizeof(*fimpl)); - fimpl->defaultclock = TRUE; - fimpl->IUnknown_inner.lpVtbl = &IInner_VTable; - fimpl->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; - fimpl->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; - fimpl->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; - fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; - fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; - fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; - fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; - fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; - fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; - fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; - fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; - fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; - fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; - fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; - fimpl->ref = 1; - list_init(&fimpl->filters); - fimpl->name_index = 1; - fimpl->refClock = NULL; - fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); - fimpl->HandleEcComplete = TRUE; - fimpl->HandleEcRepaint = TRUE; - fimpl->HandleEcClockChanged = TRUE; - fimpl->notif.hWnd = 0; - fimpl->notif.disabled = FALSE; - fimpl->nRenderers = 0; - fimpl->EcCompleteCount = 0; - fimpl->refClockProvider = NULL; - fimpl->state = State_Stopped; - fimpl->pSite = NULL; - EventsQueue_Init(&fimpl->evqueue); - InitializeCriticalSection(&fimpl->cs); - fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); - fimpl->nItfCacheEntries = 0; - memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); - fimpl->stream_start = fimpl->stream_elapsed = 0; - fimpl->punkFilterMapper2 = NULL; - fimpl->version = 0; - fimpl->current_pos = 0; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - if (threaded) + object->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; + object->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; + object->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; + object->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; + object->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + object->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; + object->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; + object->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; + object->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; + object->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; + object->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; + object->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; + object->IUnknown_inner.lpVtbl = &IInner_VTable; + object->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; + object->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; + object->ref = 1; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, object->outer_unk, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&object->punkFilterMapper2))) { - fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); - fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); - WaitForSingleObject(fimpl->message_thread_ret, INFINITE); + ERR("Failed to create filter mapper, hr %#x.\n", hr); + free(object); + return hr; } - else - fimpl->message_thread = NULL; - fimpl->outer_unk = outer ? outer : &fimpl->IUnknown_inner; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); - /* create Filtermapper aggregated. */ - hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); + object->defaultclock = TRUE; + EventsQueue_Init(&object->evqueue); + list_init(&object->filters); + object->HandleEcClockChanged = TRUE; + object->HandleEcComplete = TRUE; + object->HandleEcRepaint = TRUE; + object->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); + object->name_index = 1; + object->timeformatseek = TIME_FORMAT_MEDIA_TIME; - if (FAILED(hr)) { - ERR("Unable to create filter mapper (%x)\n", hr); - if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); - CloseHandle(fimpl->hEventCompletion); - EventsQueue_Destroy(&fimpl->evqueue); - fimpl->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&fimpl->cs); - CoTaskMemFree(fimpl); - return hr; + if (threaded) + { + object->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + object->message_thread = CreateThread(NULL, 0, message_thread_run, object, 0, &object->message_thread_id); + WaitForSingleObject(object->message_thread_ret, INFINITE); } + else + object->message_thread = NULL; - *out = &fimpl->IUnknown_inner; + TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); + *out = &object->IUnknown_inner; return S_OK; }

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: vkd3d Branch: master Commit: de252f9b144de53a67577fe1fb42a7a0c770bed3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de252f9b144de53a67577fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:54 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/dxbc.c | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ab670ec..b5bf13a 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -503,12 +503,14 @@ struct vkd3d_root_signature_desc }; /* root signature 1.1 */ -enum vkd3d_root_descriptor_flags +enum vkd3d_shader_root_descriptor_flags { - VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAGS), }; enum vkd3d_shader_descriptor_range_flags @@ -542,7 +544,7 @@ struct vkd3d_root_descriptor1 { unsigned int shader_register; unsigned int register_space; - enum vkd3d_root_descriptor_flags flags; + enum vkd3d_shader_root_descriptor_flags flags; }; struct vkd3d_root_parameter1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 76a6a47..cad2556 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2211,7 +2211,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ -#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) @@ -2398,10 +2398,10 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) { - unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown root descriptor flags %#x.\n", unknown_flags);

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_parameter_type enumeration to vkd3d_shader_root_parameter_type.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: vkd3d Branch: master Commit: 8b397eec8890daf66b86f5c1e4445847db332e33 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b397eec8890daf66b86f5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:55 2020 +0430 vkd3d-shader: Rename the vkd3d_root_parameter_type enumeration to vkd3d_shader_root_parameter_type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 18 +++++------ libs/vkd3d-shader/dxbc.c | 60 +++++++++++++++++------------------ libs/vkd3d-shader/vkd3d_shader_main.c | 4 +-- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8b397eec8890daf66b8…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: vkd3d Branch: master Commit: 6b0eb4671657ffb8a7c07d97d3906c26ea5e15cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b0eb4671657ffb8a7c07d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:53 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range1 structure to vkd3d_shader_descriptor_range1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d7711b0..ab670ec 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -522,7 +522,7 @@ enum vkd3d_shader_descriptor_range_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; -struct vkd3d_descriptor_range1 +struct vkd3d_shader_descriptor_range1 { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -535,7 +535,7 @@ struct vkd3d_descriptor_range1 struct vkd3d_root_descriptor_table1 { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range1 *descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; struct vkd3d_root_descriptor1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7692880..76a6a47 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2253,7 +2253,7 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } -static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +static void shader_validate_descriptor_range1(const struct vkd3d_shader_descriptor_range1 *range) { unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE @@ -2266,7 +2266,7 @@ static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_rang } static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range1 *ranges) { const char *ptr; unsigned int i; @@ -2329,7 +2329,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table1 *table) { - struct vkd3d_descriptor_range1 *ranges; + struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; const char *ptr; @@ -2832,7 +2832,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table1 *table) { - const struct vkd3d_descriptor_range1 *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3080,7 +3080,7 @@ static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range1 *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3200,7 +3200,7 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { - const struct vkd3d_descriptor_range1 *ranges1; + const struct vkd3d_shader_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3320,7 +3320,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; - struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_shader_descriptor_range1 *ranges1; unsigned int i, j; int ret;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range structure to vkd3d_shader_descriptor_range.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: vkd3d Branch: master Commit: de76e7c0b58d31284ce00771fa3332e7c4effcc2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de76e7c0b58d31284ce0077… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:52 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range structure to vkd3d_shader_descriptor_range. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc61dc5..d7711b0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -428,7 +428,7 @@ enum vkd3d_shader_descriptor_range_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE), }; -struct vkd3d_descriptor_range +struct vkd3d_shader_descriptor_range { enum vkd3d_shader_descriptor_range_type range_type; unsigned int descriptor_count; @@ -440,7 +440,7 @@ struct vkd3d_descriptor_range struct vkd3d_root_descriptor_table { unsigned int descriptor_range_count; - const struct vkd3d_descriptor_range *descriptor_ranges; + const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; struct vkd3d_root_constants diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6035aee..7692880 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2223,7 +2223,7 @@ struct root_signature_parser_context }; static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) + unsigned int offset, unsigned int count, struct vkd3d_shader_descriptor_range *ranges) { const char *ptr; unsigned int i; @@ -2302,7 +2302,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context static int shader_parse_descriptor_table(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor_table *table) { - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int count; const char *ptr; @@ -2809,7 +2809,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, const struct vkd3d_root_descriptor_table *table) { - const struct vkd3d_descriptor_range *ranges = table->descriptor_ranges; + const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; for (i = 0; i < table->descriptor_range_count; ++i) @@ -3044,7 +3044,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_ta for (i = 0; i < descriptor_table->descriptor_range_count; ++i) { - const struct vkd3d_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; + const struct vkd3d_shader_descriptor_range *r = &descriptor_table->descriptor_ranges[i]; if (r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_SRV || r->range_type == VKD3D_SHADER_DESCRIPTOR_RANGE_TYPE_UAV @@ -3201,7 +3201,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_descriptor_range1 *ranges1; - struct vkd3d_descriptor_range *ranges; + struct vkd3d_shader_descriptor_range *ranges; unsigned int i, j; int ret; @@ -3319,7 +3319,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, const struct vkd3d_root_parameter *src, unsigned int count) { - const struct vkd3d_descriptor_range *ranges; + const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_descriptor_range1 *ranges1; unsigned int i, j; int ret;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: vkd3d Branch: master Commit: 7c2120124bcce403a7800e9e198d1fb01c904051 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c2120124bcce403a7800e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 16:10:51 2020 +0430 vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 16 +++++++++------- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 50c64ca..cc61dc5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -511,13 +511,15 @@ enum vkd3d_root_descriptor_flags VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, }; -enum vkd3d_descriptor_range_flags +enum vkd3d_shader_descriptor_range_flags { - VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, - VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS), }; struct vkd3d_descriptor_range1 @@ -526,7 +528,7 @@ struct vkd3d_descriptor_range1 unsigned int descriptor_count; unsigned int base_shader_register; unsigned int register_space; - enum vkd3d_descriptor_range_flags flags; + enum vkd3d_shader_descriptor_range_flags flags; unsigned int descriptor_table_offset; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a0f03cf..6035aee 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2214,7 +2214,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, #define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ - (VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) + (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) struct root_signature_parser_context { @@ -2255,11 +2255,11 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) { - unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown descriptor range flags %#x.\n", unknown_flags);

1 0