February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Don't force query_sink() onto a Wine thread.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: d355fa798857d34e8a69fc2e51c4eee3175bbe7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d355fa798857d34e8a69fc2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:59 2021 -0600 winegstreamer: Don't force query_sink() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 9 +-------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 90c34b1cb39..312c12fd194 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,19 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) -{ - struct cb_data cbdata = { QUERY_SINK }; - - cbdata.u.query_sink_data.pad = pad; - cbdata.u.query_sink_data.parent = parent; - cbdata.u.query_sink_data.query = query; - - call_cb(&cbdata); - - return cbdata.u.query_sink_data.ret; -} - GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) { diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index cbd9a630885..f6f1ffb526b 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, BYTESTREAM_QUERY, @@ -94,12 +93,6 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct query_sink_data { - GstPad *pad; - GstObject *parent; - GstQuery *query; - gboolean ret; - } query_sink_data; } u; int finished; @@ -115,7 +108,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean bytestream_query_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean bytestream_pad_mode_activate_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8fc1e8608a1..e1309e97c4c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2858,7 +2858,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name gst_pad_set_element_private(stream->my_sink, pin); gst_pad_set_chain_function(stream->my_sink, got_data_sink); gst_pad_set_event_function(stream->my_sink, event_sink); - gst_pad_set_query_function(stream->my_sink, query_sink_wrapper); + gst_pad_set_query_function(stream->my_sink, query_sink); filter->sources[filter->source_count++] = pin; parser->streams[parser->stream_count++] = stream; @@ -2927,13 +2927,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case QUERY_SINK: - { - struct query_sink_data *data = &cbdata->u.query_sink_data; - cbdata->u.query_sink_data.ret = query_sink(data->pad, data->parent, - data->query); - break; - } default: { assert(0);

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in query_sink().
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: 29cea50d27bf611d1dc64520c1b6bd9c0241b315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29cea50d27bf611d1dc64520… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:58 2021 -0600 winegstreamer: Avoid using Wine debug functions in query_sink(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e6abc50e41b..8fc1e8608a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -920,7 +920,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) struct parser_source *pin = gst_pad_get_element_private(pad); struct wg_parser_stream *stream = pin->wg_stream; - TRACE("pin %p, type \"%s\".\n", pin, gst_query_type_get_name(query->type)); + GST_LOG("pin %p, type \"%s\".", pin, gst_query_type_get_name(query->type)); switch (query->type) { @@ -966,7 +966,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) if (!ret && WARN_ON(gstreamer)) { gchar *str = gst_caps_to_string(caps); - WARN("Rejecting caps \"%s\".\n", debugstr_a(str)); + GST_WARNING("Rejecting caps \"%s\".", str); g_free(str); } gst_query_set_accept_caps_result(query, ret);

1 0

Zebediah Figura : winegstreamer: Use amt_to_wg_format() in decodebin_parser_source_query_accept().
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: d028217a56f61631ad577f51a7b0b5083bbfc825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d028217a56f61631ad577f51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:57 2021 -0600 winegstreamer: Use amt_to_wg_format() in decodebin_parser_source_query_accept(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 070e2eca7f7..e6abc50e41b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -889,15 +889,6 @@ static GstCaps *wg_format_to_caps(const struct wg_format *format) return NULL; } -static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) -{ - struct wg_format wg_format; - - if (!amt_to_wg_format(mt, &wg_format)) - return NULL; - return wg_format_to_caps(&wg_format); -} - static bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) { if (a->major_type != b->major_type) @@ -2261,13 +2252,10 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - /* At least make sure we can convert it to GstCaps. */ - GstCaps *caps = amt_to_gst_caps(mt); + struct wg_format format; - if (!caps) - return S_FALSE; - gst_caps_unref(caps); - return S_OK; + /* At least make sure we can convert it to wg_format. */ + return amt_to_wg_format(mt, &format) ? S_OK : S_FALSE; } static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin,

1 0

Zebediah Figura : winegstreamer: Compare wg_format structures in GST_QUERY_ACCEPT_CAPS.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: 897800fd449ae0ea5da00206bd348aa9f76f4b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=897800fd449ae0ea5da00206… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:55 2021 -0600 winegstreamer: Compare wg_format structures in GST_QUERY_ACCEPT_CAPS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 71 ++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7c70041000c..51e7a5abef1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -628,14 +628,6 @@ static bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format return false; } -static bool amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) -{ - struct wg_format wg_format; - - wg_format_from_caps(&wg_format, caps); - return amt_from_wg_format(mt, &wg_format); -} - static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *format) { static const struct @@ -906,6 +898,32 @@ static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) return wg_format_to_caps(&wg_format); } +static bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) +{ + if (a->major_type != b->major_type) + return false; + + switch (a->major_type) + { + case WG_MAJOR_TYPE_UNKNOWN: + return false; + + case WG_MAJOR_TYPE_AUDIO: + return a->u.audio.format == b->u.audio.format + && a->u.audio.channels == b->u.audio.channels + && a->u.audio.rate == b->u.audio.rate; + + case WG_MAJOR_TYPE_VIDEO: + return a->u.video.format == b->u.video.format + && a->u.video.width == b->u.video.width + && a->u.video.height == b->u.video.height + && a->u.video.fps_d * b->u.video.fps_n == a->u.video.fps_n * b->u.video.fps_d; + } + + assert(0); + return false; +} + static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { struct parser_source *pin = gst_pad_get_element_private(pad); @@ -941,8 +959,8 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } case GST_QUERY_ACCEPT_CAPS: { + struct wg_format format; gboolean ret = TRUE; - AM_MEDIA_TYPE mt; GstCaps *caps; if (!stream->enabled) @@ -952,45 +970,14 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } gst_query_parse_accept_caps(query, &caps); - if (!amt_from_gst_caps(caps, &mt)) - return FALSE; - - if (!IsEqualGUID(&mt.majortype, &pin->pin.pin.mt.majortype) - || !IsEqualGUID(&mt.subtype, &pin->pin.pin.mt.subtype) - || !IsEqualGUID(&mt.formattype, &pin->pin.pin.mt.formattype)) - ret = FALSE; - - if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video)) - { - const VIDEOINFOHEADER *req_vih = (VIDEOINFOHEADER *)mt.pbFormat; - const VIDEOINFOHEADER *our_vih = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; - - if (req_vih->bmiHeader.biWidth != our_vih->bmiHeader.biWidth - || req_vih->bmiHeader.biHeight != our_vih->bmiHeader.biHeight - || req_vih->bmiHeader.biBitCount != our_vih->bmiHeader.biBitCount - || req_vih->bmiHeader.biCompression != our_vih->bmiHeader.biCompression) - ret = FALSE; - } - else if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) - { - const WAVEFORMATEX *req_wfx = (WAVEFORMATEX *)mt.pbFormat; - const WAVEFORMATEX *our_wfx = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; - - if (req_wfx->nChannels != our_wfx->nChannels - || req_wfx->nSamplesPerSec != our_wfx->nSamplesPerSec - || req_wfx->wBitsPerSample != our_wfx->wBitsPerSample) - ret = FALSE; - } - - FreeMediaType(&mt); - + wg_format_from_caps(&format, caps); + ret = wg_format_compare(&format, &stream->current_format); if (!ret && WARN_ON(gstreamer)) { gchar *str = gst_caps_to_string(caps); WARN("Rejecting caps \"%s\".\n", debugstr_a(str)); g_free(str); } - gst_query_set_accept_caps_result(query, ret); return TRUE; }

1 0

Zebediah Figura : winegstreamer: Store the current stream format in the wg_parser_stream structure.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: 5bff63621eebd269d0765a39418429466dd222f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bff63621eebd269d0765a39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:54 2021 -0600 winegstreamer: Store the current stream format in the wg_parser_stream structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0389edc4c13..7c70041000c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -104,7 +104,7 @@ struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - struct wg_format preferred_format; + struct wg_format preferred_format, current_format; pthread_cond_t event_cond, event_empty_cond; struct wg_parser_event event; @@ -2746,6 +2746,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, struct wg_parser_stream *stream = pin->wg_stream; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; + bool ret; if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo)) { @@ -2764,6 +2765,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->nAvgBytesPerSec; } + ret = amt_to_wg_format(&pin->pin.pin.mt, &stream->current_format); + assert(ret); stream->enabled = true; gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure());

1 0

Zebediah Figura : winegstreamer: Handle MPEG-1 audio formats in amt_to_wg_format().
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: dfeafc74171f116282a4535d4794438bad686771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeafc74171f116282a4535d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:53 2021 -0600 winegstreamer: Handle MPEG-1 audio formats in amt_to_wg_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 82801900a15..0389edc4c13 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -686,6 +686,57 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo return false; } +static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const MPEG1WAVEFORMAT *audio_format = (const MPEG1WAVEFORMAT *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) + { + ERR("Unexpected format size %u.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO; + format->u.audio.channels = audio_format->wfx.nChannels; + format->u.audio.rate = audio_format->wfx.nSamplesPerSec; + if (audio_format->fwHeadLayer == 1) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1; + else if (audio_format->fwHeadLayer == 2) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2; + else if (audio_format->fwHeadLayer == 3) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + else + return false; + return true; +} + +static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const MPEGLAYER3WAVEFORMAT *audio_format = (const MPEGLAYER3WAVEFORMAT *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) + { + ERR("Unexpected format size %u.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO; + format->u.audio.channels = audio_format->wfx.nChannels; + format->u.audio.rate = audio_format->wfx.nSamplesPerSec; + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + return true; +} + static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *format) { static const struct @@ -750,7 +801,13 @@ static bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return amt_to_wg_format_video(mt, format); if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + { + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload)) + return amt_to_wg_format_audio_mpeg1(mt, format); + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MP3)) + return amt_to_wg_format_audio_mpeg1_layer3(mt, format); return amt_to_wg_format_audio(mt, format); + } FIXME("Unknown major type %s.\n", debugstr_guid(&mt->majortype)); return false;

1 0

Zebediah Figura : vkd3d-shader: Use struct source_location as the Bison location type.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: vkd3d Branch: master Commit: f1acb3d3836724f2fbfd9a8739e567d1873f7d01 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1acb3d3836724f2fbfd9a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:52 2021 -0600 vkd3d-shader: Use struct source_location as the Bison location type. 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 | 17 ++-- libs/vkd3d-shader/hlsl.y | 211 +++++++++++++++++++++-------------------------- 2 files changed, 104 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f1acb3d3836724f2fbf…

1 0

Zebediah Figura : vkd3d-shader: Move hlsl_ctx initialization and cleanup to hlsl_compile_shader().
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: vkd3d Branch: master Commit: 74007172825bf70b80c331c7e158701ee2b5222d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74007172825bf70b80c331c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:50 2021 -0600 vkd3d-shader: Move hlsl_ctx initialization and cleanup to hlsl_compile_shader(). 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.c | 182 ++++++++++++++++++++++++++++++++++++++++++----- libs/vkd3d-shader/hlsl.h | 11 ++- libs/vkd3d-shader/hlsl.l | 5 +- libs/vkd3d-shader/hlsl.y | 153 +++------------------------------------ 4 files changed, 180 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=74007172825bf70b80c…

1 0

Zebediah Figura : vkd3d-shader: Make the HLSL compiler reëntrant.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: vkd3d Branch: master Commit: c7d4acaf4b0d2db6b529901140dcbafaf04b312d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7d4acaf4b0d2db6b529901… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:53 2021 -0600 vkd3d-shader: Make the HLSL compiler reëntrant. 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.c | 100 +++++----- libs/vkd3d-shader/hlsl.h | 44 ++--- libs/vkd3d-shader/hlsl.l | 98 +++++----- libs/vkd3d-shader/hlsl.y | 466 ++++++++++++++++++++++++----------------------- 4 files changed, 362 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c7d4acaf4b0d2db6b52…

1 0

Zebediah Figura : vkd3d-shader: Move parse_* structure definitions to hlsl.y.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: vkd3d Branch: master Commit: 3854991154d9961b34c89f3e9d99d46112915212 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3854991154d9961b34c89f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:49 2021 -0600 vkd3d-shader: Move parse_* structure definitions to hlsl.y. 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.h | 70 ----------------------------------------- libs/vkd3d-shader/hlsl.y | 81 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 72 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index daa2db2..a3c16c5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -398,76 +398,6 @@ struct hlsl_scope struct hlsl_scope *upper; }; -/* Structures used only during parsing */ -struct parse_parameter -{ - struct hlsl_type *type; - const char *name; - const char *semantic; - const struct hlsl_reg_reservation *reg_reservation; - unsigned int modifiers; -}; - -struct parse_colon_attribute -{ - const char *semantic; - struct hlsl_reg_reservation *reg_reservation; -}; - -struct parse_initializer -{ - struct hlsl_ir_node **args; - unsigned int args_count; - struct list *instrs; -}; - -struct parse_variable_def -{ - struct list entry; - struct source_location loc; - - char *name; - unsigned int array_size; - const char *semantic; - struct hlsl_reg_reservation *reg_reservation; - struct parse_initializer initializer; -}; - -struct parse_function -{ - char *name; - struct hlsl_ir_function_decl *decl; -}; - -struct parse_if_body -{ - struct list *then_instrs; - struct list *else_instrs; -}; - -enum parse_unary_op -{ - UNARY_OP_PLUS, - UNARY_OP_MINUS, - UNARY_OP_LOGICNOT, - UNARY_OP_BITNOT, -}; - -enum parse_assign_op -{ - ASSIGN_OP_ASSIGN, - ASSIGN_OP_ADD, - ASSIGN_OP_SUB, - ASSIGN_OP_MUL, - ASSIGN_OP_DIV, - ASSIGN_OP_MOD, - ASSIGN_OP_LSHIFT, - ASSIGN_OP_RSHIFT, - ASSIGN_OP_AND, - ASSIGN_OP_OR, - ASSIGN_OP_XOR, -}; - struct hlsl_parse_ctx { const char **source_files; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c97ce05..5c3160f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -19,10 +19,87 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%{ + +%code requires +{ + #include "hlsl.h" #include <stdio.h> +struct parse_parameter +{ + struct hlsl_type *type; + const char *name; + const char *semantic; + const struct hlsl_reg_reservation *reg_reservation; + unsigned int modifiers; +}; + +struct parse_colon_attribute +{ + const char *semantic; + struct hlsl_reg_reservation *reg_reservation; +}; + +struct parse_initializer +{ + struct hlsl_ir_node **args; + unsigned int args_count; + struct list *instrs; +}; + +struct parse_variable_def +{ + struct list entry; + struct source_location loc; + + char *name; + uint32_t array_size; + const char *semantic; + struct hlsl_reg_reservation *reg_reservation; + struct parse_initializer initializer; +}; + +struct parse_function +{ + char *name; + struct hlsl_ir_function_decl *decl; +}; + +struct parse_if_body +{ + struct list *then_instrs; + struct list *else_instrs; +}; + +enum parse_unary_op +{ + UNARY_OP_PLUS, + UNARY_OP_MINUS, + UNARY_OP_LOGICNOT, + UNARY_OP_BITNOT, +}; + +enum parse_assign_op +{ + ASSIGN_OP_ASSIGN, + ASSIGN_OP_ADD, + ASSIGN_OP_SUB, + ASSIGN_OP_MUL, + ASSIGN_OP_DIV, + ASSIGN_OP_MOD, + ASSIGN_OP_LSHIFT, + ASSIGN_OP_RSHIFT, + ASSIGN_OP_AND, + ASSIGN_OP_OR, + ASSIGN_OP_XOR, +}; + +} + +%code +{ + int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; @@ -1504,7 +1581,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, return statements_list; } -%} +} %locations %define parse.error verbose

1 0