February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Move wg_parser object creation to a new Unix library.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: dbd927f4adb00b19c2bd97e9726f0e273b2fa743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbd927f4adb00b19c2bd97e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:56 2021 -0600 winegstreamer: Move wg_parser object creation to a new Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_cbs.h | 6 - dlls/winegstreamer/gst_private.h | 88 ++++ dlls/winegstreamer/gstdemux.c | 1029 +------------------------------------ dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/wg_parser.c | 1030 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 1129 insertions(+), 1030 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbd927f4adb00b19c2bd…

1 0

Zebediah Figura : winegstreamer: Move GStreamer library initialization to __wine_init_unix_lib().
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 10dde32dc6c530d755f68a6edfb50d21c6edd2a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10dde32dc6c530d755f68a6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:57 2021 -0600 winegstreamer: Move GStreamer library initialization to __wine_init_unix_lib(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 46 +++++++++--------------------------------- dlls/winegstreamer/wg_parser.c | 17 ++++++++++++++++ 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 477ed0ad1e6..4e46a99f513 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -174,41 +174,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx) { - BOOL *status = param; - char argv0[] = "wine"; - char argv1[] = "--gst-disable-registry-fork"; - char *args[3]; - char **argv = args; - int argc = 2; - GError *err = NULL; - - TRACE("Initializing...\n"); - - argv[0] = argv0; - argv[1] = argv1; - argv[2] = NULL; - *status = gst_init_check(&argc, &argv, &err); - if (*status) - { - HINSTANCE handle; - - TRACE("Initialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), - GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + HINSTANCE handle; - /* Unloading glib is a bad idea.. it installs atexit handlers, - * so never unload the dll after loading */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, - (LPCWSTR)winegstreamer_instance, &handle); - if (!handle) - ERR("Failed to pin module %p.\n", winegstreamer_instance); + /* Unloading glib is a bad idea.. it installs atexit handlers, + * so never unload the dll after loading */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (LPCWSTR)winegstreamer_instance, &handle); + if (!handle) + ERR("Failed to pin module %p.\n", winegstreamer_instance); - start_dispatch_thread(); - } - else if (err) - { - ERR("Failed to initialize gstreamer: %s\n", debugstr_a(err->message)); - g_error_free(err); - } + start_dispatch_thread(); return TRUE; } @@ -216,11 +191,10 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct BOOL init_gstreamer(void) { static INIT_ONCE once = INIT_ONCE_STATIC_INIT; - static BOOL status; - InitOnceExecuteOnce(&once, init_gstreamer_proc, &status, NULL); + InitOnceExecuteOnce(&once, init_gstreamer_proc, NULL, NULL); - return status; + return TRUE; } static const REGPINTYPES reg_audio_mt = {&MEDIATYPE_Audio, &GUID_NULL}; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a64c3f83497..3a67a195dff 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1023,7 +1023,24 @@ NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *pt { if (reason == DLL_PROCESS_ATTACH) { + char arg0[] = "wine"; + char arg1[] = "--gst-disable-registry-fork"; + char *args[] = {arg0, arg1, NULL}; + int argc = ARRAY_SIZE(args) - 1; + char **argv = args; + GError *err; + + if (!gst_init_check(&argc, &argv, &err)) + { + ERR("Failed to initialize GStreamer: %s\n", debugstr_a(err->message)); + g_error_free(err); + return STATUS_UNSUCCESSFUL; + } + TRACE("GStreamer library version %s; wine built with %d.%d.%d.\n", + gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); + *(const struct unix_funcs **)ptr_out = &funcs; } return STATUS_SUCCESS;

1 0

Zebediah Figura : winegstreamer: Separate parser and filter initialization.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: db8746ffe9d9c2022c83d8e10e8cf043aaeb2d3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8746ffe9d9c2022c83d8e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:55 2021 -0600 winegstreamer: Separate parser and filter initialization. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 111 +++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 40 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1e14f073480..384ba9e6687 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -49,6 +49,8 @@ static const GUID MEDIASUBTYPE_MP3 = {WAVE_FORMAT_MPEGLAYER3, 0x0000, 0x0010, { struct wg_parser { + BOOL (*init_gst)(struct wg_parser *parser); + struct wg_parser_stream **streams; unsigned int stream_count; @@ -1939,19 +1941,16 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) parser->start_offset = parser->next_offset = parser->stop_offset = 0; This->next_pull_offset = 0; - if (!This->init_gst(This)) + if (!parser->init_gst(parser)) return E_FAIL; pthread_mutex_lock(&parser->mutex); - for (i = 0; i < This->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - struct parser_source *pin = This->sources[i]; - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser_stream *stream = parser->streams[i]; stream->duration = query_duration(stream->their_src); - pin->seek.llDuration = pin->seek.llStop = stream->duration; - pin->seek.llCurrent = 0; while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) @@ -2143,6 +2142,7 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons { struct parser *filter = impl_from_strmbase_sink(iface); HRESULT hr = S_OK; + unsigned int i; mark_wine_thread(); @@ -2153,6 +2153,17 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons if (FAILED(hr = GST_Connect(filter, peer))) goto err; + if (!filter->init_gst(filter)) + goto err; + + for (i = 0; i < filter->source_count; ++i) + { + struct parser_source *pin = filter->sources[i]; + + pin->seek.llDuration = pin->seek.llStop = pin->wg_stream->duration; + pin->seek.llCurrent = 0; + } + return S_OK; err: GST_RemoveOutputPins(filter); @@ -2180,13 +2191,9 @@ static const struct strmbase_sink_ops sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL decodebin_parser_init_gst(struct parser *filter) +static BOOL decodebin_parser_init_gst(struct wg_parser *parser) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; GstElement *element = gst_element_factory_make("decodebin", NULL); - struct wg_parser *parser = filter->wg_parser; - WCHAR source_name[20]; - unsigned int i; int ret; if (!element) @@ -2233,6 +2240,16 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) } pthread_mutex_unlock(&parser->mutex); + return TRUE; +} + +static BOOL decodebin_parser_filter_init_gst(struct parser *filter) +{ + static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; + struct wg_parser *parser = filter->wg_parser; + WCHAR source_name[20]; + unsigned int i; + for (i = 0; i < parser->stream_count; ++i) { sprintfW(source_name, formatW, i); @@ -2345,11 +2362,12 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = decodebin_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); - object->init_gst = decodebin_parser_init_gst; + object->init_gst = decodebin_parser_filter_init_gst; object->source_query_accept = decodebin_parser_source_query_accept; object->source_get_media_type = decodebin_parser_source_get_media_type; @@ -2944,12 +2962,9 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL wave_parser_init_gst(struct parser *filter) +static BOOL wave_parser_init_gst(struct wg_parser *parser) { - static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; - struct wg_parser *parser = filter->wg_parser; struct wg_parser_stream *stream; - struct parser_source *pin; GstElement *element; int ret; @@ -2972,12 +2987,6 @@ static BOOL wave_parser_init_gst(struct parser *filter) if (!(stream = create_stream(parser))) return FALSE; - if (!(pin = create_pin(filter, stream, source_name))) - { - free_stream(stream); - return FALSE; - } - stream->their_src = gst_element_get_static_pad(element, "src"); gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) @@ -2998,6 +3007,17 @@ static BOOL wave_parser_init_gst(struct parser *filter) return TRUE; } +static BOOL wave_parser_filter_init_gst(struct parser *filter) +{ + static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; + struct wg_parser *parser = filter->wg_parser; + + if (!create_pin(filter, parser->streams[0], source_name)) + return FALSE; + + return TRUE; +} + static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { struct wg_parser_stream *stream = pin->wg_stream; @@ -3041,10 +3061,11 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = wave_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); - object->init_gst = wave_parser_init_gst; + object->init_gst = wave_parser_filter_init_gst; object->source_query_accept = wave_parser_source_query_accept; object->source_get_media_type = wave_parser_source_get_media_type; @@ -3068,13 +3089,9 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL avi_splitter_init_gst(struct parser *filter) +static BOOL avi_parser_init_gst(struct wg_parser *parser) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; GstElement *element = gst_element_factory_make("avidemux", NULL); - struct wg_parser *parser = filter->wg_parser; - WCHAR source_name[20]; - unsigned int i; int ret; if (!element) @@ -3120,6 +3137,16 @@ static BOOL avi_splitter_init_gst(struct parser *filter) } pthread_mutex_unlock(&parser->mutex); + return TRUE; +} + +static BOOL avi_splitter_filter_init_gst(struct parser *filter) +{ + static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; + struct wg_parser *parser = filter->wg_parser; + WCHAR source_name[20]; + unsigned int i; + for (i = 0; i < parser->stream_count; ++i) { sprintfW(source_name, formatW, i); @@ -3173,10 +3200,11 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = avi_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); - object->init_gst = avi_splitter_init_gst; + object->init_gst = avi_splitter_filter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; object->source_get_media_type = avi_splitter_source_get_media_type; @@ -3205,12 +3233,9 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL mpeg_splitter_init_gst(struct parser *filter) +static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) { - static const WCHAR source_name[] = {'A','u','d','i','o',0}; - struct wg_parser *parser = filter->wg_parser; struct wg_parser_stream *stream; - struct parser_source *pin; GstElement *element; int ret; @@ -3233,12 +3258,6 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) if (!(stream = create_stream(parser))) return FALSE; - if (!(pin = create_pin(filter, stream, source_name))) - { - free_stream(stream); - return FALSE; - } - gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { @@ -3267,6 +3286,17 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) return TRUE; } +static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) +{ + static const WCHAR source_name[] = {'A','u','d','i','o',0}; + struct wg_parser *parser = filter->wg_parser; + + if (!create_pin(filter, parser->streams[0], source_name)) + return FALSE; + + return TRUE; +} + static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { struct wg_parser_stream *stream = pin->wg_stream; @@ -3333,12 +3363,13 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = mpeg_audio_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; - object->init_gst = mpeg_splitter_init_gst; + object->init_gst = mpeg_splitter_filter_init_gst; object->source_query_accept = mpeg_splitter_source_query_accept; object->source_get_media_type = mpeg_splitter_source_get_media_type; object->enum_sink_first = TRUE;

1 0

Paul Gofman : opengl32: Support PFD_DEPTH_DONTCARE flag in wglChoosePixelFormat().
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 45f8b6924a45188a2fc20504545ef40f62b028da URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f8b6924a45188a2fc20504… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 11 13:04:51 2021 +0300 opengl32: Support PFD_DEPTH_DONTCARE flag in wglChoosePixelFormat(). With this flag set native implementation ignores cDepthBits but cares to find a zero depth format if possible. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 12 ++++++++++++ dlls/opengl32/wgl.c | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 90f06492e81..e93636ed75e 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -330,6 +330,18 @@ static void test_choosepixelformat(void) ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAuxBuffers = 0; + + pfd.dwFlags |= PFD_DEPTH_DONTCARE; + pfd.cDepthBits = 24; + ok( test_pfd(&pfd, &ret_fmt), "PFD_DEPTH_DONTCARE failed.\n" ); + ok( !ret_fmt.cDepthBits, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "PFD_DEPTH_DONTCARE, depth 24, stencil 8 failed.\n" ); + ok( !ret_fmt.cDepthBits || ret_fmt.cDepthBits == 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + pfd.dwFlags &= ~PFD_DEPTH_DONTCARE; } static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index a1422fbfcd4..cf46c6dfa8a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -563,7 +563,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } - if (ppfd->cDepthBits) + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) @@ -599,6 +599,9 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } + if (ppfd->dwFlags & PFD_DEPTH_DONTCARE && format.cDepthBits < best.cDepthBits) + goto found; + continue; found:

1 0

Rémi Bernon : widl: Introduce new strappend helper.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 6341546fde9c17c41fbc40302e47c9fcb28e01e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6341546fde9c17c41fbc4030… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 17:37:28 2021 +0100 widl: Introduce new strappend helper. And use it for format_namespace to grow buffer as needed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 46 +++++++++++++++------------------------------- tools/widl/utils.c | 37 +++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 1 + 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index f696d30a5f5..203fffcdee6 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -89,41 +89,25 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } -static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator, const char *abi_prefix) +static size_t append_namespace(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *separator, const char *abi_prefix) { - if(is_global_namespace(namespace)) { - if(!abi_prefix) return ptr; - strcpy(ptr, abi_prefix); - strcat(ptr, separator); - return ptr + strlen(ptr); - } - - ptr = append_namespace(ptr, namespace->parent, separator, abi_prefix); - strcpy(ptr, namespace->name); - strcat(ptr, separator); - return ptr + strlen(ptr); + int nested = namespace && !is_global_namespace(namespace); + const char *name = nested ? namespace->name : abi_prefix; + size_t n = 0; + if (!name) return 0; + if (nested) n += append_namespace(buf, len, pos + n, namespace->parent, separator, abi_prefix); + n += strappend(buf, len, pos + n, "%s%s", name, separator); + return n; } -char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, - const char *abi_prefix) +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix) { - unsigned len = strlen(prefix) + strlen(suffix); - unsigned sep_len = strlen(separator); - struct namespace *iter; - char *ret, *ptr; - - if(abi_prefix) - len += strlen(abi_prefix) + sep_len; - - for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) - len += strlen(iter->name) + sep_len; - - ret = xmalloc(len+1); - strcpy(ret, prefix); - ptr = append_namespace(ret + strlen(ret), namespace, separator, abi_prefix); - strcpy(ptr, suffix); - - return ret; + size_t len = 0, pos = 0; + char *buf = NULL; + pos += strappend(&buf, &len, pos, "%s", prefix); + pos += append_namespace(&buf, &len, pos, namespace, separator, abi_prefix); + pos += strappend(&buf, &len, pos, "%s", suffix); + return buf; } type_t *type_new_function(var_list_t *args) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index ea92372c8c7..634bd12a0ba 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -245,6 +245,43 @@ char *strmake( const char* fmt, ... ) } } +size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) +{ + size_t size; + va_list ap; + char *ptr; + int n; + + assert( buf && len ); + assert( (*len == 0 && *buf == NULL) || (*len != 0 && *buf != NULL) ); + + if (*buf) + { + size = *len; + ptr = *buf; + } + else + { + size = 100; + ptr = xmalloc( size ); + } + + for (;;) + { + va_start( ap, fmt ); + n = vsnprintf( ptr + pos, size - pos, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if (pos + (size_t)n >= size) size = pos + n + 1; + else break; + ptr = xrealloc( ptr, size ); + } + + *len = size; + *buf = ptr; + return n; +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 37406656504..82e0a6ae489 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -45,6 +45,7 @@ void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); +size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) __attribute__((__format__ (__printf__, 4, 5 ))); char *dup_basename(const char *name, const char *ext); size_t widl_getline(char **linep, size_t *lenp, FILE *fp);

1 0

Henri Verbeet : vkd3d-shader: Keep track of declared SPIR-V input components.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: vkd3d Branch: master Commit: 8313225cc6bbb646d001fe9faf41f0eedfea6672 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8313225cc6bbb646d001fe9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 16:22:48 2021 +0100 vkd3d-shader: Keep track of declared SPIR-V input components. In particular, a shader may declare e.g. v6.x to refer to an output from the previous stage, and v6.y to refer to a builtin, or the other way around. At the same time, different hull shader phases may redeclare the same register. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 101 ++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8313225cc6bbb646d00…

1 0

Zebediah Figura : vkd3d-shader: Use struct vkd3d_shader_location in struct hlsl_ctx.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: vkd3d Branch: master Commit: 3bf0e40b9d8f185f6df8b087a7b5edd52a10cadf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bf0e40b9d8f185f6df8b08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 12 10:48:56 2021 -0600 vkd3d-shader: Use struct vkd3d_shader_location in struct hlsl_ctx. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 10 +++++----- libs/vkd3d-shader/hlsl.h | 4 +--- libs/vkd3d-shader/hlsl.l | 12 +++++------- libs/vkd3d-shader/hlsl.y | 6 +++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 4597be1..a129e84 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1482,16 +1482,16 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->message_context = message_context; - ctx->line_no = ctx->column = 1; - if (!(ctx->source_file = vkd3d_strdup(""))) - return false; if (!(ctx->source_files = vkd3d_malloc(sizeof(*ctx->source_files)))) + return false; + if (!(ctx->source_files[0] = vkd3d_strdup(""))) { - vkd3d_free((void *)ctx->source_file); + vkd3d_free(ctx->source_files); return false; } - ctx->source_files[0] = ctx->source_file; ctx->source_files_count = 1; + ctx->location.source_name = ctx->source_files[0]; + ctx->location.line = ctx->location.column = 1; ctx->matrix_majority = HLSL_COLUMN_MAJOR; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 59bf314..067aae8 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -395,9 +395,7 @@ struct hlsl_ctx { const char **source_files; unsigned int source_files_count; - const char *source_file; - unsigned int line_no; - unsigned int column; + struct vkd3d_shader_location location; enum parse_status status; struct vkd3d_shader_message_context *message_context; diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 38b4bf1..a0e0bed 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -209,8 +209,8 @@ row_major {return KW_ROW_MAJOR; } {NEWLINE} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - ctx->line_no++; - ctx->column = 1; + ++ctx->location.line; + ctx->location.column = 1; } ^# { @@ -238,7 +238,7 @@ row_major {return KW_ROW_MAJOR; } <pp_pragma>{NEWLINE} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - FIXME("Unsupported preprocessor #pragma directive at line %u.\n", ctx->line_no); + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", ctx->location.line); BEGIN(INITIAL); } <pp_pragma>{ANY} {} @@ -279,10 +279,8 @@ row_major {return KW_ROW_MAJOR; } static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) { - lloc->source_name = ctx->source_file; - lloc->line = ctx->line_no; - lloc->column = ctx->column; - ctx->column += yyget_leng(ctx->scanner); + *lloc = ctx->location; + ctx->location.column += yyget_leng(ctx->scanner); } int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 15c9c9c..d7201f5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1762,8 +1762,8 @@ preproc_directive: const char **new_array = NULL; TRACE("Updating line information to file %s, line %u.\n", debugstr_a($2), $1); - ctx->line_no = $1; - if (strcmp($2, ctx->source_file)) + ctx->location.line = $1; + if (strcmp($2, ctx->location.source_name)) new_array = vkd3d_realloc(ctx->source_files, sizeof(*ctx->source_files) * (ctx->source_files_count + 1)); @@ -1771,7 +1771,7 @@ preproc_directive: { ctx->source_files = new_array; ctx->source_files[ctx->source_files_count++] = $2; - ctx->source_file = $2; + ctx->location.source_name = $2; } else {

1 0

Zebediah Figura : vkd3d-shader: Replace struct source_location with struct vkd3d_shader_location.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: vkd3d Branch: master Commit: 3a975c2215e10c2c934953a9e6d93f0797e35e20 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a975c2215e10c2c934953a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 12 10:48:55 2021 -0600 vkd3d-shader: Replace struct source_location with struct vkd3d_shader_location. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 28 +++++++++++++++------------- libs/vkd3d-shader/hlsl.h | 41 +++++++++++++++++------------------------ libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++---------------- 4 files changed, 50 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3a975c2215e10c2c934…

1 0

Henri Verbeet : vkd3d-shader: Handle non-vec4 builtins in vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation().
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: vkd3d Branch: master Commit: 3a710385f3fb213c6872a17997d72b4fcbbf6615 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a710385f3fb213c6872a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 16:22:46 2021 +0100 vkd3d-shader: Handle non-vec4 builtins in vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 106c298..72bb61f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6268,16 +6268,18 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd3d_dxbc_compiler *compiler) { + uint32_t type_id, length_id, register_index_id, src_array_id, dst_array_id, vicp_id, tmp_id; const struct vkd3d_shader_signature *signature = compiler->input_signature; + uint32_t src_type_id, dst_type_id, src_id, dst_id, point_index_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, length_id, index_id, src_id, dst_id, vicp_id; const struct vkd3d_shader_signature_element *element; enum vkd3d_shader_input_sysval_semantic sysval; const struct vkd3d_spirv_builtin *builtin; - unsigned int register_count, i; + unsigned int register_count, i, j; struct vkd3d_shader_register r; struct vkd3d_symbol symbol; struct rb_entry *entry; + uint32_t indices[2]; for (i = 0, register_count = 0; i < signature->element_count; ++i) { @@ -6303,26 +6305,51 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd entry = rb_get(&compiler->symbol_table, &symbol); vicp_id = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry)->id; - index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); - dst_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, index_id); + register_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); + dst_array_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, register_index_id); if (element->sysval_semantic) { sysval = vkd3d_siv_from_sysval(element->sysval_semantic); builtin = get_spirv_builtin_for_sysval(compiler, sysval); - src_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, + src_array_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, compiler->input_control_point_count); + + if (builtin->component_count == 4) + { + vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); + } + else + { + tmp_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, builtin->component_count); + src_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, tmp_id); + dst_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, tmp_id); + + for (j = 0; j < compiler->input_control_point_count; ++j) + { + point_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, j); + src_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, + src_type_id, src_array_id, point_index_id); + + indices[0] = point_index_id; + indices[1] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, + dst_type_id, dst_array_id, indices, 2); + + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } + } } else { - src_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + src_array_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassInput, VKD3D_SHADER_COMPONENT_FLOAT, 4, compiler->input_control_point_count); - vkd3d_spirv_add_iface_variable(builder, src_id); - vkd3d_spirv_build_op_decorate1(builder, src_id, SpvDecorationLocation, element->register_index); - vkd3d_spirv_build_op_name(builder, src_id, "v%u", element->register_index); - } + vkd3d_spirv_add_iface_variable(builder, src_array_id); + vkd3d_spirv_build_op_decorate1(builder, src_array_id, SpvDecorationLocation, element->register_index); + vkd3d_spirv_build_op_name(builder, src_array_id, "v%u", element->register_index); - vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); + } } }

1 0

Zebediah Figura : vkd3d-shader: Use hlsl_report_message() to report use of reserved keywords.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: vkd3d Branch: master Commit: e3e0c264754877a396162baced76de6319279de9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3e0c264754877a396162ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 12 10:48:52 2021 -0600 vkd3d-shader: Use hlsl_report_message() to report use of reserved keywords. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index b109084..7e1fe14 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -65,8 +65,8 @@ ANY (.) {RESERVED4} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", ctx->line_no, yytext); - set_parse_status(&ctx->status, PARSE_ERR); + hlsl_report_message(ctx, *yylloc, HLSL_LEVEL_ERROR, + "Reserved keyword \"%s\" used.\n", yytext); } BlendState {return KW_BLENDSTATE; }

1 0