wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

Shaun Ren : winegstreamer: Map MF_SD_LANGUAGE to ISO 639-1 for QuickTime media.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 2eecb04ca75407765253998c70ca69a0fee32356 URL: https://gitlab.winehq.org/wine/wine/-/commit/2eecb04ca75407765253998c70ca69… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Dec 2 22:04:13 2022 -0500 winegstreamer: Map MF_SD_LANGUAGE to ISO 639-1 for QuickTime media. For QuickTime media, MF_SD_LANGUAGE contains the ISO 639-1-mapped language code. Some games such as Borderlands 3 expect this behaviour. In order to determine the type of the media, we store the demuxer caps in the wg_parser structure. --- configure | 14 +++++++------- configure.ac | 2 +- dlls/winegstreamer/wg_parser.c | 28 +++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/configure b/configure index bdffe3e28b2..4c1b2f1da04 100755 --- a/configure +++ b/configure @@ -2563,10 +2563,10 @@ Some influential environment variables: PULSE_LIBS Linker flags for libpulse, overriding pkg-config GSTREAMER_CFLAGS C compiler flags for gstreamer-1.0 gstreamer-video-1.0 - gstreamer-audio-1.0, overriding pkg-config + gstreamer-audio-1.0 gstreamer-tag-1.0, overriding pkg-config GSTREAMER_LIBS Linker flags for gstreamer-1.0 gstreamer-video-1.0 - gstreamer-audio-1.0, overriding pkg-config + gstreamer-audio-1.0 gstreamer-tag-1.0, overriding pkg-config UDEV_CFLAGS C compiler flags for libudev, overriding pkg-config UDEV_LIBS Linker flags for libudev, overriding pkg-config UNWIND_CFLAGS @@ -16919,7 +16919,7 @@ if ${GSTREAMER_CFLAGS:+false} : then : if test ${PKG_CONFIG+y} then : - GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 2>conftest.err` + GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 2>conftest.err` fi fi @@ -16927,15 +16927,15 @@ if ${GSTREAMER_LIBS:+false} : then : if test ${PKG_CONFIG+y} then : - GSTREAMER_LIBS=`$PKG_CONFIG --libs gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 2>/dev/null` + GSTREAMER_LIBS=`$PKG_CONFIG --libs gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 2>/dev/null` fi fi -printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 cflags: $GSTREAMER_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 cflags: $GSTREAMER_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 libs: $GSTREAMER_LIBS" >&5 if test -s conftest.err; then - printf %s "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 errors: " >&5 + printf %s "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 errors: " >&5 cat conftest.err >&5 fi rm -f conftest.err diff --git a/configure.ac b/configure.ac index 3c30db8fd45..54f2b00fe76 100644 --- a/configure.ac +++ b/configure.ac @@ -1570,7 +1570,7 @@ WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"], dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then - WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,, + WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0],,,, [AC_CHECK_HEADER([gst/gst.h], [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 281013162aa..f2c59488ef3 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -33,6 +33,7 @@ #include <gst/gst.h> #include <gst/video/video.h> #include <gst/audio/audio.h> +#include <gst/tag/tag.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -93,6 +94,8 @@ struct wg_parser bool sink_connected; bool unlimited_buffering; + + gchar *sink_caps; }; struct wg_parser_stream @@ -476,7 +479,9 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { + struct wg_parser *parser = user; const char *name = gst_element_factory_get_longname(fact); + const char *klass = gst_element_factory_get_klass(fact); GST_INFO("Using \"%s\".", name); @@ -490,6 +495,10 @@ static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, GST_WARNING("Disabled video acceleration since it breaks in wine."); return GST_AUTOPLUG_SELECT_SKIP; } + + if (!parser->sink_caps && strstr(klass, GST_ELEMENT_FACTORY_KLASS_DEMUXER)) + parser->sink_caps = g_strdup(gst_structure_get_name(gst_caps_get_structure(caps, 0))); + return GST_AUTOPLUG_SELECT_TRY; } @@ -1326,7 +1335,18 @@ static void query_tags(struct wg_parser_stream *stream) if (!stream->tags[WG_PARSER_TAG_LANGUAGE]) { - gst_tag_list_get_string(tag_list, GST_TAG_LANGUAGE_CODE, &stream->tags[WG_PARSER_TAG_LANGUAGE]); + gchar *lang_code = NULL; + + gst_tag_list_get_string(tag_list, GST_TAG_LANGUAGE_CODE, &lang_code); + if (stream->parser->sink_caps && !strcmp(stream->parser->sink_caps, "video/quicktime")) + { + /* For QuickTime media, we convert the language tags to ISO 639-1. */ + const gchar *lang_code_iso_639_1 = lang_code ? gst_tag_get_language_code_iso_639_1(lang_code) : NULL; + stream->tags[WG_PARSER_TAG_LANGUAGE] = lang_code_iso_639_1 ? g_strdup(lang_code_iso_639_1) : NULL; + g_free(lang_code); + } + else + stream->tags[WG_PARSER_TAG_LANGUAGE] = lang_code; } gst_event_unref(tag_event); @@ -1493,6 +1513,9 @@ out: parser->container = NULL; } + g_free(parser->sink_caps); + parser->sink_caps = NULL; + pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; pthread_mutex_unlock(&parser->mutex); @@ -1536,6 +1559,9 @@ static NTSTATUS wg_parser_disconnect(void *args) gst_object_unref(parser->container); parser->container = NULL; + g_free(parser->sink_caps); + parser->sink_caps = NULL; + return S_OK; }

1 0

Shaun Ren : winegstreamer: Parse all tag events in query_tags.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 4a9c72b866b2a611cb8a89ab903c3de18bb699d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a9c72b866b2a611cb8a89ab903c3d… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Dec 2 19:43:38 2022 -0500 winegstreamer: Parse all tag events in query_tags. Some gstreamer plugins, such as asfdemux, generate multiple tag events. --- dlls/winegstreamer/wg_parser.c | 82 ++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d2db1f039e4..281013162aa 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1276,47 +1276,61 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) static void query_tags(struct wg_parser_stream *stream) { const gchar *struct_name; - GstTagList *tag_list; GstEvent *tag_event; - guint i, tag_count; - const GValue *val; - GstSample *sample; - GstBuffer *buf; - gsize size; + guint i, j; - if (!(tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, 0))) - return; - - gst_event_parse_tag(tag_event, &tag_list); - gst_tag_list_get_string(tag_list, "language-code", &stream->tags[WG_PARSER_TAG_LANGUAGE]); + stream->tags[WG_PARSER_TAG_NAME] = NULL; + stream->tags[WG_PARSER_TAG_LANGUAGE] = NULL; - /* Extract stream name from Quick Time demuxer private tag where it puts unrecognized chunks. */ - tag_count = gst_tag_list_get_tag_size(tag_list, "private-qt-tag"); - for (i = 0; i < tag_count; ++i) + i = 0; + while ((tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, i++))) { - if (!(val = gst_tag_list_get_value_index(tag_list, "private-qt-tag", i))) - continue; - if (!GST_VALUE_HOLDS_SAMPLE(val) || !(sample = gst_value_get_sample(val))) - continue; - struct_name = gst_structure_get_name(gst_sample_get_info(sample)); - if (!struct_name || strcmp(struct_name, "application/x-gst-qt-name-tag")) - continue; - if (!(buf = gst_sample_get_buffer(sample))) - continue; - if ((size = gst_buffer_get_size(buf)) < 8) - continue; - size -= 8; - if (!(stream->tags[WG_PARSER_TAG_NAME] = g_malloc(size + 1))) - continue; - if (gst_buffer_extract(buf, 8, stream->tags[WG_PARSER_TAG_NAME], size) != size) + GstTagList *tag_list; + + gst_event_parse_tag(tag_event, &tag_list); + + if (!stream->tags[WG_PARSER_TAG_NAME]) + { + /* Extract stream name from Quick Time demuxer private tag where it puts unrecognized chunks. */ + const GValue *val; + GstSample *sample; + GstBuffer *buf; + gsize size; + guint tag_count = gst_tag_list_get_tag_size(tag_list, "private-qt-tag"); + + for (j = 0; j < tag_count; ++j) + { + if (!(val = gst_tag_list_get_value_index(tag_list, "private-qt-tag", j))) + continue; + if (!GST_VALUE_HOLDS_SAMPLE(val) || !(sample = gst_value_get_sample(val))) + continue; + struct_name = gst_structure_get_name(gst_sample_get_info(sample)); + if (!struct_name || strcmp(struct_name, "application/x-gst-qt-name-tag")) + continue; + if (!(buf = gst_sample_get_buffer(sample))) + continue; + if ((size = gst_buffer_get_size(buf)) < 8) + continue; + size -= 8; + if (!(stream->tags[WG_PARSER_TAG_NAME] = g_malloc(size + 1))) + continue; + if (gst_buffer_extract(buf, 8, stream->tags[WG_PARSER_TAG_NAME], size) != size) + { + g_free(stream->tags[WG_PARSER_TAG_NAME]); + stream->tags[WG_PARSER_TAG_NAME] = NULL; + continue; + } + stream->tags[WG_PARSER_TAG_NAME][size] = 0; + } + } + + if (!stream->tags[WG_PARSER_TAG_LANGUAGE]) { - g_free(stream->tags[WG_PARSER_TAG_NAME]); - stream->tags[WG_PARSER_TAG_NAME] = NULL; - continue; + gst_tag_list_get_string(tag_list, GST_TAG_LANGUAGE_CODE, &stream->tags[WG_PARSER_TAG_LANGUAGE]); } - stream->tags[WG_PARSER_TAG_NAME][size] = 0; + + gst_event_unref(tag_event); } - gst_event_unref(tag_event); } static NTSTATUS wg_parser_connect(void *args)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix window leaks in dom tests.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: bdc67e95b5be27dec97d49bbe5da1e71ae00ce24 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc67e95b5be27dec97d49bbe5da1e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml/tests: Fix window leaks in dom tests. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6a960bfa21f..c9c52776fa9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1350,6 +1350,7 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) hres = IHTMLWindow2_get_document(window, &ret); ok_(__FILE__,line)(hres == S_OK, "get_document failed: %08lx\n", hres); ok_(__FILE__,line)(ret != NULL, "document = NULL\n"); + IHTMLWindow2_Release(window); return ret; } @@ -6313,6 +6314,7 @@ static void test_location(IHTMLDocument2 *doc) ok(hres == S_OK, "get_location failed: %08lx\n", hres); ok(location == location2, "location != location2\n"); IHTMLLocation_Release(location2); + IHTMLWindow2_Release(window); test_ifaces((IUnknown*)location, location_iids); test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation, NULL, L"about:blank"); @@ -7564,6 +7566,7 @@ static void test_xhr(IHTMLDocument2 *doc) SysFreeString(str); IHTMLWindow2_Release(window); + IDispatchEx_Release(dispex); } static void test_defaults(IHTMLDocument2 *doc)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix EventObj leak in onclick test.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 5f031f2c877fb6ccbd186941ecf6d3243affc9d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f031f2c877fb6ccbd186941ecf6d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml/tests: Fix EventObj leak in onclick test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cd6006805d4..30b6d8799b6 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1270,6 +1270,7 @@ static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, D ok(event != NULL, "event == NULL\n"); test_event_cancelbubble(event, VARIANT_TRUE); + IHTMLEventObj_Release(event); return S_OK; }

1 0

Gabriel Ivăncescu : mshtml: Don't initialize HTMLElement dispex for Option constructor.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: f3ad67d7a5d879f5894a934f98a4cde392f6e4e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3ad67d7a5d879f5894a934f98a4cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Don't initialize HTMLElement dispex for Option constructor. It's not an element, so it doesn't even implement those interfaces. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 4dfbbd916a7..c5610b41a1d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -646,7 +646,6 @@ static dispex_static_data_t HTMLOptionElementFactory_dispex = { &HTMLOptionElementFactory_dispex_vtbl, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, - HTMLElement_init_dispex_info }; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionElementFactory **ret_ptr)

1 0

Gabriel Ivăncescu : mshtml: Release the image factory's dispex.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 5c3b2854315c5c084eb29b869cd2d8819981f826 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c3b2854315c5c084eb29b869cd2d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Release the image factory's dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlimg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index c0333cab858..01cc8405f87 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -855,8 +855,10 @@ static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *if TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) + if(!ref) { + release_dispex(&This->dispex); free(This); + } return ref; }

1 0

Gabriel Ivăncescu : mshtml: Don't hold ref to the created window in the FrameBase.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 355eb6b91bb36ccd85ad10b219766ed60da39fff URL: https://gitlab.winehq.org/wine/wine/-/commit/355eb6b91bb36ccd85ad10b219766e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Don't hold ref to the created window in the FrameBase. Note that for the case when mozwindow_to_window returns an existing window, no ref is added to it anyway, so this is just leaking. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index e1b1562b0dc..38bb53dc551 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -48,9 +48,14 @@ static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) return E_FAIL; window = mozwindow_to_window(mozwindow); - if(!window && frame->element.node.doc->browser) + if(!window && frame->element.node.doc->browser) { hres = create_outer_window(frame->element.node.doc->browser, mozwindow, frame->element.node.doc->outer_window, &window); + + /* Don't hold ref to the created window; the parent keeps ref to it */ + if(SUCCEEDED(hres)) + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } mozIDOMWindowProxy_Release(mozwindow); if(FAILED(hres)) return hres;

1 0

Gabriel Ivăncescu : mshtml: Don't release the frame returned by get_frame_by_name.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 6a1b12bd8ffca9c16177aac01ac5370f6688c55a URL: https://gitlab.winehq.org/wine/wine/-/commit/6a1b12bd8ffca9c16177aac01ac537… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Don't release the frame returned by get_frame_by_name. It does *not* add a ref to the returned frame. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 732f5ec7316..f013ba20d1c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3593,8 +3593,6 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(SUCCEEDED(hres) && frame) { global_prop_t *prop; - IHTMLWindow2_Release(&frame->base.IHTMLWindow2_iface); - prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); if(!prop) return E_OUTOFMEMORY;

1 0

Zebediah Figura : wined3d: Use a string channel desc to initialize typed formats.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: bb82bc78f439ba92ae5a40979c8037dcb10477d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb82bc78f439ba92ae5a40979c8037… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 10 18:39:54 2023 -0600 wined3d: Use a string channel desc to initialize typed formats. Avoid the need for manually set type attributes, and initialize the component count for all such formats. This fixes use of R11G11B10_FLOAT as a vertex attribute format with the GL backend. Since it has no corresponding typeless format, prior to this commit the component count was uninitialized and hence use of the format would result in a GL error. This fixes a GL error with Dark Souls Remastered. I did not immediately observe any corresponding rendering errors, however. --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/tests/d3d11.c | 3 +- dlls/wined3d/utils.c | 173 +++++++++++++++++++-------------------- 3 files changed, 85 insertions(+), 94 deletions(-)

1 0

Zebediah Figura : wined3d: Separate a parse_channel_desc() helper.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 941e685a5b06b45319e8c4c347976e225d657336 URL: https://gitlab.winehq.org/wine/wine/-/commit/941e685a5b06b45319e8c4c347976e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 10 18:24:50 2023 -0600 wined3d: Separate a parse_channel_desc() helper. --- dlls/wined3d/utils.c | 69 +++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fb350acf56f..4af95ab1ffb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2048,10 +2048,46 @@ static enum wined3d_channel_type map_channel_type(char t) } } +static void parse_channel_desc(struct wined3d_format *format, const char *channel_desc) +{ + unsigned int component_count = 0; + unsigned int attrs = 0; + unsigned int j; + + for (j = 0; j < strlen(channel_desc); ++j) + { + enum wined3d_channel_type channel_type = map_channel_type(channel_desc[j]); + + if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) + attrs |= WINED3D_FORMAT_ATTR_NORMALISED; + if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) + attrs |= WINED3D_FORMAT_ATTR_INTEGER; + if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) + attrs |= WINED3D_FORMAT_ATTR_FLOAT; + if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) + ++component_count; + + if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) + { + format->depth_size = format->red_size; + format->red_size = format->red_offset = 0; + } + + if (channel_type == WINED3D_CHANNEL_TYPE_STENCIL && !format->stencil_size) + { + format->stencil_size = format->green_size; + format->green_size = format->green_offset = 0; + } + } + + format->attrs |= attrs; + format->component_count = component_count; +} + static BOOL init_format_base_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; - unsigned int i, j; + unsigned int i; for (i = 0; i < ARRAY_SIZE(formats); ++i) { @@ -2078,8 +2114,6 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { struct wined3d_format *typeless_format; - unsigned int component_count = 0; - unsigned int attrs = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) return FALSE; @@ -2106,34 +2140,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) typeless_format->typeless_id = typeless_format->id; - for (j = 0; j < strlen(typed_formats[i].channels); ++j) - { - enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]); - - if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) - attrs |= WINED3D_FORMAT_ATTR_NORMALISED; - if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) - attrs |= WINED3D_FORMAT_ATTR_INTEGER; - if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) - attrs |= WINED3D_FORMAT_ATTR_FLOAT; - if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) - ++component_count; - - if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) - { - format->depth_size = format->red_size; - format->red_size = format->red_offset = 0; - } - - if (channel_type == WINED3D_CHANNEL_TYPE_STENCIL && !format->stencil_size) - { - format->stencil_size = format->green_size; - format->green_size = format->green_offset = 0; - } - } - - format->component_count = component_count; - format->attrs |= attrs; + parse_channel_desc(format, typed_formats[i].channels); } for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i)

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2023